(cherry picked from commit 2e43c28e01fe006210e71aab179527669f6412ed) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
(cherry picked from commit 2e43c28e01fe006210e71aab179527669f6412ed) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java