[zookeeper] Fix borked rebase
Merge pull request #208 from airbnb/chronos-zk-upgrade

[zookeeper] Fix borked rebase