CAMEL-8116: some checkstyle changes