(cherry picked from commit 89cab1ba5f0671f8ef30dbe7432079c18362b434) Conflicts: hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java
(cherry picked from commit 89cab1ba5f0671f8ef30dbe7432079c18362b434) Conflicts: hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java