Squash additional commits into merge commits for merge PRs

In cases where the contributor has to push additional commits on top of the merge commit for a merge PR (e.g. failed jcheck or reviewer feedback) then we should squash the additional commits into the merge commit and then integrate with merge.