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