(cherry picked from commit 38c4c14472996562eb3d610649246770c2888c6b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
(cherry picked from commit 38c4c14472996562eb3d610649246770c2888c6b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml