adding solr tomcat.  settings.php alterations
merge fix