Update changelog for recent C&C changes.
Merge pull request #5011 from pchote/psydev-changelog

Update changelog for recent C&C merges.