Add polling to servodutil's stop logic to allow some seconds for servod to turn down. If the process still has not died by then, get nasty and SIGKILL it before cleaning up the stale scratch file.