Cleanup CHANGES.txt and move the jira to appropriate 2.x release section to make it consistent with branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475779 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-288-trunk-gd