de144175a4
(cherry picked from commit d8923cdbf1567aee10a54f144fef734d1465ebed) (cherry picked from commit c0ab3c8407b110dd9083d775e5ea823cbf73e7d4) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java