8564927a4e
(cherry picked from commit 3ddb260e30e7424363bcde68176bcea1ad8d6392) Conflicts: hadoop-build-tools/pom.xml
(cherry picked from commit 3ddb260e30e7424363bcde68176bcea1ad8d6392) Conflicts: hadoop-build-tools/pom.xml