Fix tests comparing tokens

There were tests that verified that the PKI token body could be
encrypted with CMS and compared to the token ID in the response.
This test isn't safe because the token body may be different than
the token encrypted with CMS since the order of items in the dict
can change.

The fix is to change the test to decode the PKI token ID and
compare that to the response body JSON instead.

Conflicts:
	keystone/tests/test_v3_auth.py

Change-Id: Icc649b96071ff084d5c76f2ea2bcf3ecb08a0351
Merge remote-tracking branch 'upstream/stable/icehouse' into stable/icehouse