CAMEL-7844: Fix the broken OSGi tests as well as polish the codebase a bit