Squashed commits for the new Solr/Central Search capability