(cherry picked from commit e418bd1fb0568ce7ae22f588fea2dd9c95567383) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
(cherry picked from commit e418bd1fb0568ce7ae22f588fea2dd9c95567383) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java