Merge "port test_simple_tenant_usage into nova v3 part2"