SOLR-5488: Fix up test failures for analytics component. Some cleanups suggested by IntelliJ's analysis

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1545514 13f79535-47bb-0310-9956-ffa450edef68