Add merge commit when releasing feature branches.

This is the same set of commands used by Github when merging via the
Github Merge Button.