Checkstyle cleanup for OSGi package