incorrect script for tomcat shutdown
starting solr was starting the incorrect apache install
reduce some code duplication