(cherry picked from commit 919a1d824a0a61145dc7ae59cfba3f34d91f2681) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
(cherry picked from commit 919a1d824a0a61145dc7ae59cfba3f34d91f2681) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java