SWITCHYARD-2068 & SWITCHYARD-2069

https://issues.jboss.org/browse/SWITCHYARD-2068
https://issues.jboss.org/browse/SWITCHYARD-2069