Interrupt instead of killing on stop

Former behavior was causing invalid cleanup for some services (not sure
if more robust checking is necessary).