(cherry picked from commit 92e5e9159850c01635091ea6ded0d8ee76691a9a) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsAdmin.java
(cherry picked from commit 92e5e9159850c01635091ea6ded0d8ee76691a9a) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsAdmin.java