Merge pull request #3045 from krichter722/checkstyle-closure

STORM-3429: closure: fix all checkstyle warnings