Merge branch 'master' into bugs/401682 Conflicts: tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/bug/tests/UMLBugTests.java