[prep-release-3.1.0] Update CHANGELOG with last minute changes