Merging r1561819 from trunk to branch-2 to fix CHANGES.txt for HADOOP-10086 and HADOOP-9982

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