(cherry picked from commit 63c966a3fbeb675959fc4101e65de9f57aecd17d) (cherry picked from commit 242c7f1fee664b4d609a6c72e899f10816430f65) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java