(cherry picked from commit 97913f430cbe3f82ac866ae6ab8f42754102f6c0) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
(cherry picked from commit 97913f430cbe3f82ac866ae6ab8f42754102f6c0) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java