Merge "Remove ZooKeeperConnectionConfig class" into feature/zuulv3