MPS-17799 can't use diff - Fix diff dialog (metadata)
MPS-17799 can't use diff - Fix merge dialog
MPS-17799 can't use diff - do not use uuid of the model in metadata diff
MPS-17799 can't use diff - fix diff popup in editor
Merge remote-tracking branch 'origin/master' into 3.0/mikev/test

Conflicts:
	plugins/vcs/common/models/jetbrains/mps/vcs/platform/integration.mps
make
fix diff in editor