Merge "Include the VPN server IP address in the VPN state file." into lmp-dev