remove references to ZookeeperClient
fix TestCluster to use new zookeeper interface