(cherry picked from commit 6d2da38d16cebe9b82f1048f87127eecee33664c) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java (cherry picked from commit 6f4192d77d0551b2ca847c8c1ee5b1c4a3380c36)