Topic package checkstyle compliant
Merge pull request #1848 from pveentjer/checkstyles/topic

Topic package checkstyle compliant