Fixes #33 - upgrade solr and Tomcat

Also replace solr.xml with old version again