(cherry picked from commit 295d678be8853a52c3ec3da43d9265478d6632b3) (cherry picked from commit 80697e4f324948ec32b4cad3faccba55287be652) (cherry picked from commit b3546b60340e085c5abd8f8f0990d45c7445fe07) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit e9c8d8c58516aa64589cd44e9e5dd0a23ba72a17)