Merge pull request #15753 from pprindeville/strongswan-start-charon-directly