CLA-677 Switching to ZooKeeper