synchronize CHAGELOG.md with the CE master
Fix accidental commit of unresolved merge conflicts and fix desync'd CHNAGELOG.md file.
Closes #3001 (closed)
Edited by Mike Greiling
Fix accidental commit of unresolved merge conflicts and fix desync'd CHNAGELOG.md file.
Closes #3001 (closed)