Merge "Add Zookeeper to tests" into feature/zuulv3