(cherry picked from commit b2e6cf607f1712d103520ca6b3ff21ecc07cd265) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java
(cherry picked from commit b2e6cf607f1712d103520ca6b3ff21ecc07cd265) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java