(cherry picked from commit 6757329c43c1d6586c135b5aa00f144dd0d8d2f1)
(cherry picked from commit 80935268f5fdd358070c6b68f89e8bd699785c54) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt