Heat stack will rollback on error (MRN-728)

Change-Id: I2755a557a4a5d810afc8b3e34aa5b318358baae2
Merge "Heat stack will rollback on error (MRN-728)"