UML-265  Reduce the scope of the EdgeMapping semantic candidate expressions

Reduce the scope of edge mappings in the object diagram.
 UML-265  Reduce the scope of the EdgeMapping semantic candidate expressions

Reduce the scope of edge mappings in the deployment diagram.