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