merge 2.0604 changelog and fix entries for unreleased fixes