(cherry picked from commit 72fe54684198b7df5c5fb2114616dff6d17a4402) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
(cherry picked from commit 72fe54684198b7df5c5fb2114616dff6d17a4402) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java