Moved CHANGES.txt entry to 2.6.1 (cherry picked from commit e7aa81394dce61cc96d480e21204263a5f2ed153)