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