(cherry picked from commit 89b16d27e26216fc4e5153683105b323c310a0af) Conflicts: hadoop-hdfs-project/hadoop-hdfs/pom.xml hadoop-mapreduce-project/pom.xml (cherry picked from commit 38a031ce68c65956b3dd69b6a93baab1be2beac7)
(cherry picked from commit 89b16d27e26216fc4e5153683105b323c310a0af) Conflicts: hadoop-hdfs-project/hadoop-hdfs/pom.xml hadoop-mapreduce-project/pom.xml (cherry picked from commit 38a031ce68c65956b3dd69b6a93baab1be2beac7)