RM9305

Fixes cases where we may accidentally leak resources owned by other
tenants through Nova.
Merge pull request #220 from Cerberus98/rm9305

RM9305