Merge pull request #3041 from krichter722/checkstyle-integration-test

STORM-3427: integration-test: fix all checkstyle warnings