Merge pull request #3073 from krichter722/checkstyle-solr

STORM-3455: solr: fix all checkstyle warnings