(cherry picked from commit f63e4e4f2eee6b75c3a6c3fb5926d44c7e846145) Conflicts: hadoop-project/pom.xml (cherry picked from commit 51d17f3cb399ae0ed66d3a2357ef091151d25646)