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