(cherry picked from commit 451265a83d8798624ae2a144bc58fa41db826704) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java
(cherry picked from commit 451265a83d8798624ae2a144bc58fa41db826704) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java