(cherry picked from commit 63ac2db59af2b50e74dc892cae1dbc4d2e061423) (cherry picked from commit cc56bed6867f844810f5fda0cba3cbc9a9367269) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImplTestUtils.java