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