Merge "Improve test coverage for disconnecting networks with clat."