HBASE-7681 Address some recent random test failures

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