Move some of the jiras merged into branch-2 to appropriate 2.x section in CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1485306 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4298. StorageRetentionManager spews warnings when used with QJM. Contributed by Aaron T. Myers.


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