900dc70a01
(cherry picked from commit ea839bd48e4478fc7b6d0a69e0eaeae2de5e0f0d) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml (cherry picked from commit 20585ade1d9d7fbd8b9df8b1e3db5a74fd4441a6)