Signed-off-by: Xin Sun <ddupgs@gmail.com> (cherry picked from commit 31fc97edeede08cfc9c8dd9fe22c3775ede2eebb) Conflicts: hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.java hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestUpdateRSGroupConfiguration.java