extract WaitForSolr from sunspot:solr:start task.
timeout after 10 seconds when waiting for solr to boot.
sunspot:solr:restart task already exists.
make it explicit that we're overriding an existing task.
merge sunspot:solr:condstart and start tasks, and reuse WaitForSolr's run-detection, since existing tasks already handle pid cleanup.