EUCA-9234 Stack resources deleted when stack is deleted
Merge branch 'dev/ethomas/EUCA-9234' into testing