(cherry picked from commit 9649c27864a23ea156bae904368c1d3cf94c6e9d) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java
(cherry picked from commit 9649c27864a23ea156bae904368c1d3cf94c6e9d) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResources.java