(cherry picked from commit fcb3fcd4c674d58e5f40b17eff7048e8ae45d151) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md (cherry picked from commit dac2021f870af674ab1a64e937c4f2a388dcc692) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md