ZOOKEEPER-1719. zkCli.sh, zkServer.sh and zkEnv.sh regression caused by ZOOKEEPER-1663
  (Marshall McMullen via camille)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1497830 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1413. Use on-disk transaction log for learner sync up (thawan)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1497929 13f79535-47bb-0310-9956-ffa450edef68
Merge pull request #2 from apache/trunk

sync with upstream