Merge pull request #16367 from pprindeville/strongswan-mod-socket-dep