(cherry picked from commit be35fa186cc0c5c1f90028a9383851d47791bf04) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
(cherry picked from commit be35fa186cc0c5c1f90028a9383851d47791bf04) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java