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