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