Added code to forcefully kill solr process because it won't quit on its own, and made it not remove the pid file because it's nice to have the pid around to reuse it.
Added code to forcefully kill solr process because it won't quit on its own, and made it not remove the pid file because it's nice to have the pid around to reuse it.

git-svn-id: 8ae0a6b396effb9e2d04f216330b631e689e8608@750 54c6411d-1744-0410-a9eb-b99409f43359

botandrose/calagator,botandrose/calagator,botandrose/calagator,botandrose/calagator