Co-authored-by: Duo Zhang <zhangduo@apache.org> Signed-off-by: Yu Li <liyu@apache.org> (cherry picked from commit 7fc167493398436dccc4bc7864f39b278f386119) Conflicts: hbase-testing-util/src/main/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterImpl.java