GS-11239 Fix problem with teardown-cloud