Update #promise_stop to accept a kill flag

* this is to enable use during staging task teardown on timeout

Signed-off-by: Aram Price <aprice@pivotallabs.com>