Merge pull request #3058 from krichter722/checkstyle-hive

STORM-3443: hive: fix all checkstyle warnings