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