commit: Merge: fixup ChangeLogs.