5dc2e78c97
(cherry picked from commit 89d1fd5dac4bccf42d82686e146b02eb60d14736) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt