Wait for the Heat stack become not in progress before attempting to modify it in any way

Change-Id: I6c643f58aada0a8525711bc452d0c581625f3d26