5e6bbe6031
(cherry picked from commit 8e1bdc17d9134e01115ae7c929503d8ac0325207) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt