Fix minor nits for token2saml generation.

bknudson left few (mostly) minor comments on the token2saml patch.
This commit addresses them.

Change-Id: I755e4a064d5ada1215e82f143914af1bd1cfcd9d
Implements: bp keystone-to-keystone-federation
Merge "Fix minor nits for token2saml generation."