HBASE-7914 Port the fix of HBASE-6748 into 0.94 branch (Jeffrey Zhong)



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