Solr - this could be merged now but would break dashboard and celery.

All tests pass