a400f396a6
Contributed by Ranith Sardar. (cherry picked from commit 546c5d70efebb828389f609a89b123c4ee51f867) (cherry picked from commit c5eca3f7ee095d6a261eb411ad97aba654d67d13) Conflicts: hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/util/TestDistCpUtils.java