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