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