(cherry picked from commit a21895a5b3644944fe04cf558d593b96da0263fd) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DebugAdmin.java (cherry picked from commit 29fd36e2f1e3b34b3cb4c047d93bf88a70dc8149)
(cherry picked from commit a21895a5b3644944fe04cf558d593b96da0263fd) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DebugAdmin.java (cherry picked from commit 29fd36e2f1e3b34b3cb4c047d93bf88a70dc8149)