HBASE-7624 Backport HBASE-5359 and HBASE-7596 to 0.94 (Jefferey Zhong)



git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1455730 13f79535-47bb-0310-9956-ffa450edef68