Merge pull request #3063 from krichter722/checkstyle-core

STORM-3448: core: fix all checkstyle warnings