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