(cherry picked from commit 11d144d2284be29da1f49e163db0763636dcf058) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
(cherry picked from commit 11d144d2284be29da1f49e163db0763636dcf058) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock