Merge changelogs on release branch
Prepare changelog for master branch