RM9305

Fixes cases where we may accidentally leak resources owned by other
tenants through Nova.