(cherry picked from commit f94d89270464ea8e0d19e26e425835cd6a5dc5de) (cherry picked from commit c5c663c05d9e2b562b1fad3d81f90acf50e27fe6) Conflicts: hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/package-info.java
(cherry picked from commit f94d89270464ea8e0d19e26e425835cd6a5dc5de) (cherry picked from commit c5c663c05d9e2b562b1fad3d81f90acf50e27fe6) Conflicts: hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/package-info.java