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