Contributed by Prabhu Joseph (cherry picked from commit 155864da006346a500ff35c2f6b69281093195b1) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestFSSchedulerConfigurationStore.java Co-authored-by: Eric Yang <eyang@apache.org>