cea1c71087
(cherry picked from commit b1ed28fa77cb2fab80c54f9dfeb5d8b7139eca34) Conflicts: hadoop-common-project/hadoop-common/pom.xml hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml