(cherry picked from commit 372d1302c63c6f49f99be5766c5da9647ebd9ca6) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/DfsClientConf.java
(cherry picked from commit 372d1302c63c6f49f99be5766c5da9647ebd9ca6) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/DfsClientConf.java