HBASE-8934 Fix bunch of flaky tests ADDENDUM patch that fixes imports

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