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