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