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