Missed impact in service substitution handing resulting in one part of the code using the componentUid of the node type for the service substitution instead of the componentUid of the source component. This causes failure in generating the tosca template for the service when a relationship is created between two services in a service that uses substitution