SOLR-6886: Grouping.java tweaks

for https://issues.apache.org/jira/i#browse/SOLR-6886 ticket