HADOOP-11170. Pulling into branch-2.6 also, fixing CHANGES.txt.

(cherry picked from commit 9ada9284d82fd926e8085e571f953330fc87266f)