SWITCHYARD-1489

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