HBASE-8603 Backport HBASE-6921 to 0.94 (Ted Yu)



git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1486249 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/0.94' into 0.94-gd
Merge remote branch 'origin/0.94-gd' into fb-HBASE-8559-0.94-gd