HDFS-6482. Fix CHANGES.txt in trunk.
Merge branch 'trunk' into HDFS-6581