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