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