Merge pull request #20261 from pprindeville/strongswan-update-5.9.9