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