SOLR-8114: in Grouping.java rename groupSort to withinGroupSort (merge in revision 1709230 from trunk)