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