54dd9a14ab
(cherry picked from commit ab725cff66e8a047e9437e42ac49ac8685ee7a94) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt