Implemented token creation without catalog response.

Modified the token_factory to create token responses with
or without the catalog entry.

blueprint catalog-optional

Change-Id: Icdc4400f08f4619a19e44129c78240800a3a1e75