(cherry picked from commit 233cab89adb6bae21d7e171f2af516b92266242c) (cherry picked from commit 91d2c599685ff359ce174f2b669dca6d764b39cb) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt
(cherry picked from commit 233cab89adb6bae21d7e171f2af516b92266242c) (cherry picked from commit 91d2c599685ff359ce174f2b669dca6d764b39cb) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt