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