(cherry picked from commit 0f25a1bb52bc56661fd020a6ba82df99f8c6ef1f) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ProtoUtils.java
(cherry picked from commit 0f25a1bb52bc56661fd020a6ba82df99f8c6ef1f) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ProtoUtils.java