Merge "Bug 521167 - avoid references to the Sirius Diagram metamodel in MLT queries"