Undo the unnecessary changes to CHANGES.txt included in git-revision 06b93c7


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466777 13f79535-47bb-0310-9956-ffa450edef68
Additional fixes to CHANGES.txt to move jiras under the correct 2.x revision.


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