ZOOKEEPER-716. dump server memory detail to the log during startup (Michi Mutsuzaki via rakeshr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1596284 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1699. Leader should timeout and give up leadership when losing quorum of last proposed configuration (Alexander Shraer via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1596422 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1699. Forgot to add a new file.


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1596635 13f79535-47bb-0310-9956-ffa450edef68
ZOOKEEPER-1914. TestWatchers.cc failure - workaround (michim via fpj)



git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1596684 13f79535-47bb-0310-9956-ffa450edef68
Apply ZOOKEEPER-1892.patch.

https://issues.apache.org/jira/secure/attachment/12634331/ZOOKEEPER-1892.patch
Apply ZOOKEEPER-1870.patch.

https://issues.apache.org/jira/secure/attachment/12635000/ZOOKEEPER-1870.patch
Revert "ZOOKEEPER-297. centralize version numbering in the source/build (Diego de Oliveira via michim)"

This reverts commit 42b1a4c2dee45c686ad85156ba6ceb59fc369bf8.

Conflicts:
	CHANGES.txt
update ZOOKEEPER-1366