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