SOLR-4470 patch as uploaded to Solr JIRA

Still got NOCOMMITs and missing stuff