(cherry picked from commit 978bbdfeb2d12efd6e750da6a14849e072fb814b) (cherry picked from commit 4753676a34c4a3de29f9d20281de09533b73ce53) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt
(cherry picked from commit 978bbdfeb2d12efd6e750da6a14849e072fb814b) (cherry picked from commit 4753676a34c4a3de29f9d20281de09533b73ce53) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt