ZOOKEEPER-1900

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1606841 13f79535-47bb-0310-9956-ffa450edef68