Move HDFS-6987 from trunk to branch-2 in CHANGES.txt