Switchyard 1479

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