Preparing for CDH4.3.0 release
Applied ZOOKEEPER-1657
Porting CDH4.3 changes to 4.5 zookeeper

Merge commit 'd91a2dfc6839621365bc90e0e3d3bd9df23faca8' into cdh4-3.4.5_4.5.0.x

* commit 'd91a2dfc6839621365bc90e0e3d3bd9df23faca8':
  Applied ZOOKEEPER-1657
  Preparing for CDH4.3.0 release