Merge pull request #19145 from Thermi/strongswan-5.9.7-model-kdf-dependencies