Update CHANGELOG.txt for 2.6 release
Consolidate CHANGELOG.txt for next release