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