Apply ZOOKEEPER-1683-ver2.patch.