Merge pull request #20857 from pprindeville/strongswan-drop-local_gateway