SWITCHYARD-1565 update validation logic for service wiring

https://issues.jboss.org/browse/SWITCHYARD-1565

Also fixed unit test failures.