Merge "Increase IpClientTest verification timeout"