(cherry picked from commit 3dcb6367edd44c04a5ae0d195d851abac80d10a0) Conflicts: hadoop-project-dist/pom.xml