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