Add consumer id to token returned from OAuth

Add a consumer id field to the token that was returned from an
oauth signed call to /auth/tokens

Change-Id: I245a4301d7022ad85dbdf958cbc10ecc4921b1ea
Merge "Add consumer id to token returned from OAuth"