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>
Parenthesize all logging calls

* Also modernize hash syntax and reduce multi-line calls.

Signed-off-by: Aram Price <aprice@pivotallabs.com>
Remove staging timeout grace period

* Other post-staging operations on the container occur after the timeout,
so there should be no reason for this to differ from the staging timeout
implemented in the staging script that is run in the container.

Signed-off-by: Eric Malm <emalm@pivotallabs.com>
Initialize warden requests with parameters

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

Signed-off-by: Aram Price <aprice@pivotallabs.com>
Auto-merge remote-tracking branch 'upstream/master'