CAMEL-8116: more checkstyle changes