Uncommitted changes from hackathon. Solr still broken for AIO