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