Apply changelog tweaks from master
Backport changelog machinery from master
Add line item for changelog work
Merge branch '1.7'

Conflicts:
	docs/changelog.rst
Add changelog keywords to contribution docs
Merge branch '1.7'