(cherry picked from commit 7eeca90daabd74934d4c94af6f07fd598abdb4ed) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-project/src/site/site.xml (cherry picked from commit fbdb23d2afa993f96f073b9c4208282e8a280016)
(cherry picked from commit 7eeca90daabd74934d4c94af6f07fd598abdb4ed) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-project/src/site/site.xml (cherry picked from commit fbdb23d2afa993f96f073b9c4208282e8a280016)