Fix the issue in zk.
Merge branch 'hbase-11339-sweep-tool' of https://github.com/JingchengDu/hbase into hbase-11339-sweep-tool