LUCENESOLR-471: Patch SOLR-6248 for LWS, fix an import