HBASE-8930 REAPPLY with testfix

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