Merge pull request #3060 from krichter722/checkstyle-metrics

STORM-3445: metrics: fix all checkstyle warnings