aaa925837e
Due to bug #1239303 the wrong user could be used when obtaining a trust-scoped v2 token, so add a sanity check to ensure we can rely on the user_id, using the trustor_user_id (which we currently store but don't use) to ensure impersonation is working as expected. Change-Id: I0481a4d96c514d0d61676d27f615c735e89ad03e