(cherry picked from commit a5bb1e8ee871df1111ff77d0f6921b13c8ffb50e) Conflicts: hadoop-common-project/hadoop-common/src/main/resources/core-default.xml (cherry picked from commit c74027d9d34711c2c4baed7c98bc475d95097be0) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java