CLOUDIFY-1565 fix teardown