Fixed bunch of CS errors in camel-2.12.x