V2, V3 token intermix for unscoped tokens (bug 1156913)

Make sure we check for tenant_ref before referencing it.

Change-Id: If7918c0a9b2e99f8555e902e89166c6542105209
Merge "V2, V3 token intermix for unscoped tokens (bug 1156913)"