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