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