(cherry picked from commit eb2fb943fd97c191fd7c4f5333087a28ee5c87d8) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java (cherry picked from commit 6941e2ccbf6f4c7c8663a68c7a7c9ed59bb49fbf) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java