(cherry picked from commit c8df3668ecc37c2d58cad35520a762eaec3c8539) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/impl/pb/TestApplicationClientProtocolRecords.java
(cherry picked from commit c8df3668ecc37c2d58cad35520a762eaec3c8539) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/records/impl/pb/TestApplicationClientProtocolRecords.java