Changelog update for 2.5

#2499