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