(cherry picked from commit d0162f2040a4d98fbac51527dfc9447888cb32ab) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java
(cherry picked from commit d0162f2040a4d98fbac51527dfc9447888cb32ab) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java