Merge pull request #15601 from pprindeville/strongswan-make-swanctl-default