SWITCHYARD-2191 - Fixes for Camel implementations