Add the changelog entries for all the fixes/changes included in this merge.