(cherry picked from commit 05e04f34f27149537fdb89f46af26bee14531ca4) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
(cherry picked from commit 05e04f34f27149537fdb89f46af26bee14531ca4) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java