(cherry picked from commit 1cbcd4a491e6a57d466c2897335614dc6770b475) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml