HBASE-9581: Few tests broken since HBASE-9551

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