Switchyard 1434

https://issues.jboss.org/browse/SWITCHYARD-1434