Cleanup Solr/tomcat dependency tree.

Reorder dependencies so that cores can be created and given the correct permissions and the server config is in place before the server starts.