(cherry picked from commit 4bd7cbc29d142fc56324156333b9a8a7d7b68042) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery.java (cherry picked from commit b5e6ad457f39dd5f2176de700612e2757b3c1812)