SWITCHYARD-1851 improve merge code to properly match transformers

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