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