Heat stack could remain even if all applications were removed

 Closes-Bug: #1308910

Change-Id: I03b8ec9597575a9be5eec7a79ace7c7e74a3d775
Merge "Heat stack could remain even if all applications were removed"