Merge pull request #4853 from owncloud/technical/adapt_changelog_release_branch