Move HDFS-4165 from trunk to 2.6.0 in CHANGES.txt.