bdaa0fed13
(cherry picked from commit 7673d4f205b26a6a26cfc47d999ece96f3c42782) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml hadoop-mapreduce-project/pom.xml