HBASE-12739 Avoid too large identifier of ZooKeeperWatcher (Liu Shaohui)
Merge remote-tracking branch 'remotes/origin/0.94' into 0.94