7bb5071a9e
(cherry picked from commit db45f047ab6b19d8a3e7752bb2cde10827cd8dad) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt