Don't stop update immediately on error

When an error occurs during a stack update operation,
don't immediately stop the operation. Instead,
wait up to 4 minutes for resources already in progress
to complete before forcibly cancelling them.

Change-Id: Ib089dbc675c519668a44d1b0e3214feca5079978
Closes-bug: #1381984
(cherry picked from commit ddd6fc16d765e9f5aff8d8e173402caa6de6196d)