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