Polished to better align with Camel 2.10.3 dependencies