#416 - Upgrade to Solr 4.4.0 and simplify configuration