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