Merge pull request #3214 from gilles-peskine-arm/changelog-assemble-2.7

Backport 2.7: assemble_changelog.py