Merge "Remove references to "tenant_id" in test_qos"