SWITCHYARD-1565 update validation logic for service wiring