Waiting deleting Heat stack

Change-Id: I90d84661d578fb55be70c351739f74ad3d05da6b
Closes-bug: #1286069
Closes-bug: #1347989
Merge "Waiting deleting Heat stack"