SOLR-6118: expand.sort bug for function queries; needed to sort.rewrite(searcher)

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