Apply changelog tweaks from master
Backport changelog machinery from master
Add line item for changelog work
Add changelog keywords to contribution docs