Review 3.10 changes to networking

net-vpn-connect needs testing by someone who has two VPN connections.