897ced1a20
(cherry picked from commit db890eef3208cc557476fa510f7a253ba22bc68a) Conflicts: hadoop-project/pom.xml
(cherry picked from commit db890eef3208cc557476fa510f7a253ba22bc68a) Conflicts: hadoop-project/pom.xml