Incomplete changes for upgrade from camel-2.5.0 to camel-2.9.x