Some work on Solr templates.

Ran Resharper Code-Reformatting.