MPS-18282 Changes highlighting doesn't work with per-root persistence - ConflictingModelsWarnings
MPS-18282 Changes highlighting doesn't work with per-root persistence - load per-root model from content
MPS-18282 Changes highlighting doesn't work with per-root persistence
MPS-18282 Changes highlighting doesn't work with per-root persistence - TreeHighlighter
Merge remote-tracking branch 'origin/master' into 3.0/mikev/test
MPS-18347 After diff dialog (with current model) closed "generation required" appears on the model
Merge remote-tracking branch 'origin/master' into 3.0/mikev/test
MPS-18282 Changes highlighting doesn't work with per-root persistence - changes after review