Fix up merged ChangeLog entries (dates, duplication, etc)