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