(cherry picked from commit 69faaa1d58ad7de18a8dfa477531653a2c061568) Conflicts: hadoop-project/pom.xml (cherry picked from commit bc6874139f534af81a83523cf10508d3d16a032f)
(cherry picked from commit 69faaa1d58ad7de18a8dfa477531653a2c061568) Conflicts: hadoop-project/pom.xml (cherry picked from commit bc6874139f534af81a83523cf10508d3d16a032f)