Merge pull request #19855 from pprindeville/strongswan-update-5.9.8