Be slightly more professional or something
Consolidate changelog machinery. (Currently busted.)
Wow this took way too long to figure out.

Variable names, man. Scope! etc
Typo fix
Preseve backport flag for 984
Merge branch '1.7'

Conflicts:
	docs/changelog.rst