Zookeeper

ZOOKEEPER-2080: flaky JUnit test

ZOOKEEPER-2212: distributed race condition