Checkstyle cleanup for OSGi package
Merge pull request #2742 from noctarius/osgi-checkstyle-cleanup

Checkstyle cleanup for OSGi package