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