d389afb3da
(cherry picked from commit 69f3d428d5c3ab0c79cacffc22b1f59408622ae7) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java