Fixup problems with tenant ownership of subnets and failed network deletion

Change-Id: I648b9638cfed00b605e8ff1885076785d328b0b1