b8360139af
(cherry picked from commit 12a4ebb4471f78b642e12c2ec0784c20f62cca3c) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java