HDFS-6482. Fix CHANGES.txt in trunk