HBASE-8014 Backport HBASE-6915 to 0.94 (Jean-Marc)



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