Consolidated changes to camel configuration