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