Changes for Zookeeper jira ZOOKEEPER-1948