Leverage lightweight context and fix wrt latest Camel changes
27 files changed