HBASE-9432 Backport HBASE-8781 to 0.94 (Anoop)

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