SWITCHYARD-2387 - Scattered Camel Binding fixes