Merge branch '361958-Modeled-Viewmaps-ALL' of ssh://git.eclipse.org/gitroot/gmf-tooling/org.eclipse.gmf-tooling into 361958-Modeled-Viewmaps-ALL