Signed-off-by: stack <stack@apache.org> Conflicts: hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java