(cherry picked from commit 806e407ac8896c4e669dba1fcf86fa5d6fee7c6d) (cherry picked from commit 12497b0543176306edbd5cd8660a59b1e2e3a1c8) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java