Update changelog for recent C&C merges.

#5006 and #5007.