Merge "Test nuking IPv4 sockets as well as IPv6."
am: f6dc5650be

* commit 'f6dc5650be488bbf50b53a9344ca9ed32ec46313':
  Test nuking IPv4 sockets as well as IPv6.