Merge pull request #16984 from pprindeville/strongswan-update-5.9.4