HBASE-7925 Back port HBASE-6881 into 0.94 (Rajeshbabu)



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