SWITCHYARD-2483 - Fixes for Camel impls