properly merge notes from two sources in CellDesigner

Merged Piotr Gawron requested to merge 1772-convert-issue into devel_16.2.x

Merge request reports