Signed-off-by: Andrew Purtell <apurtell@apache.org> Conflicts: hbase-common/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.java hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestUpdateRSGroupConfiguration.java