Merge "Add tenant isolation for glance api tests"