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