Revert graceful shutdown patch

aka: "Stop, Rescue, and Delete should give guest a chance to shutdown"

This reverts commit b32d01d44ca5711c96d192df51bf7acd34f52556.

Unfortunately this patch had an unintended side effect that we didn't
notice until after it was merged.  It adds about 25 minutes to tempest
runs, which isn't really acceptable in the gate.  We need to revert this
until we can sort that out.

Change-Id: Ibdd5c86e60b5ede4ec1a38d9efa7c94d60de1720
Merge "Revert graceful shutdown patch"