(cherry picked from commit e407449ddb52c36b74358f22db498424e82ec4a7) (cherry picked from commit 2d6be7ea2311deb13cbad738b4c8fc68ad25ab2a) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java