Make service catalog include service name

If a service name is available then it should be included as part of a
token's service catalog. This functionality was present in the V2 api
and is already relied upon by various clients. It will make it much
easier to transition these clients if we can keep this functionality.

Change-Id: I0d824d73c375ffbc5a6b44c10992967f59742b01
Closes-Bug: #1288098
Merge "Make service catalog include service name"