Resolve "merge of maps which contain notes doesn't merge notes for the same element"

Placeholder Piotr Gawronrequested to merge
1810-merge-of-maps-which-contain-notes-doesn-t-merge-notes-for-the-same-element into master

Merge request reports