Merge "Remove zk host list parsing" into feature/zuulv3