CAMEL-8117: cleanup checkstyle issues