Add OS-FEDERATION section to scoped federation tokens

Add an OS-FEDERATION section to the user section in a scoped
federation token. We currently do the same for unscoped tokens.

Change-Id: Ie056297f713f71eb7dd47e6cdea87579c600cfae
Partial-Bug: #1351038
Merge "Add OS-FEDERATION section to scoped federation tokens"