Merge pull request #3035 from krichter722/checkstyle-sql-core

STORM-3417: Fix checkstyle violations in sql-core