Apply git-merge-changelog packaging patches from Samuel Bronson