CLOUDSTACK-7143: attempt to be safer when cleaning up