ZOOKEEPER-4780 review

[Muthuraj Ramalinga kumar]

Hi,
I added more commits to address review comments for ZOOKEEPER-4780.

Could someone take a look pls ?
https://github.com/apache/zookeeper/pull/2100

Thank you
Muthu