HBASE-9842 Backport HBASE-9593 and HBASE-8667 to 0.94 (rajeshbabu)

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