3740974413
(cherry picked from commit aadb77e412ab9d4ad05a0bd8b37d547ba5adad03) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java