Merge "Add a test for closing sockets when a VPN comes up." into nyc-dev