ZooKeeperManager
Merged from master
ZooKeeperManager