(cherry picked from commit 67523ffcf491f4f2db5335899c00a174d0caaa9b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestGetBlocks.java
(cherry picked from commit 67523ffcf491f4f2db5335899c00a174d0caaa9b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestGetBlocks.java