(cherry picked from commit f7e89bb349d4512b47f94b545e3f489a85e851f0) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt
(cherry picked from commit f7e89bb349d4512b47f94b545e3f489a85e851f0) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt