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