EUCA-7472
Clean up after ourselves on close.
Merge pull request #32 from eucalyptus/jpommer/dev/EUCA-7472

Jpommer/dev/euca 7472