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

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1598147 13f79535-47bb-0310-9956-ffa450edef68
Auto index & optimize imports.  And switch to java5 for-each in place of some iterators, generics issues.

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