Upgraded Camel to 2.12.0; and fixed resulting issues