Merge "VpnSettings: generate arguments for IPSec XAUTH VPNs."