a8f03ef7ea
(cherry picked from commit 9581fb715cbc8a6ad28566e83c6d0242a7306688) Conflicts: hadoop-tools/hadoop-tools-dist/pom.xml hadoop-tools/pom.xml