(cherry picked from commit 6460df21a09a7fcc29eceb8dc3859d6298da6882) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
(cherry picked from commit 6460df21a09a7fcc29eceb8dc3859d6298da6882) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java