Fix updating collections with similar names

[malarzm]

This PR includes refined test from #2195 and a fix for first scenario. Second is problematic as query tries to remove from property_old and property_old.1 which fails. PR targets master just because it doesn't matter and it's easier for me to try out stuff :) If we reach a conclusion on how to fix this should be retargeted to 1.3.x.

[stale[bot]]

This issue has been automatically marked as stale because it has not had any recent activity. It will be closed in a week if no further activity occurs. Thank you for your contributions.

[alcaeus]

@malarzm I think we need to re-educate that bot...