ZOOKEEPER-1382 for Zookeeper 3.5