HADOOP-10562: Merging r1592003 from branch-2 to branch-2.4.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1596374 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10562. Fix CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1596376 13f79535-47bb-0310-9956-ffa450edef68