(cherry picked from commit b606e025f10daed18b90b45ac00cd0c82e818581) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java (cherry picked from commit 6c93c1870c08be16876ee379cba6d59775ab6a14)
(cherry picked from commit b606e025f10daed18b90b45ac00cd0c82e818581) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java (cherry picked from commit 6c93c1870c08be16876ee379cba6d59775ab6a14)