Merge "Simplify inheritance of IpClient integration test code." into main