Contributed by hemanthboyina. (cherry picked from commit 9b8a78d97bfd825ce840c6033371c7f10e49a5b8) (cherry picked from commit f1840669cfc92c033521bf95989479523e2a649d) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java