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