changing solr/tomcat to use tomcat package for consistency