SWITCHYARD-1260: fix issues in merged model code

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