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