Simplify Acceleo expression in Component diagram
UML-355: Fix regressions on Deployment diagram