Merge pull request #3213 from gilles-peskine-arm/changelog-assemble-2.16

Backport 2.16: assemble_changelog.py