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