update ChangeLog for recent merges and commits