Tests for domain-scoped tokens

- Fixes bug 1131292: catalog returned with unscoped tokens
- Fixes bug 1131294: X-Subject-Token not returned on token validation

Change-Id: I1808613f276354e2a37cf8c154b55509a2888d89
Merge "Tests for domain-scoped tokens" into milestone-proposed