Use assertIn in test_v3_catalog

assertEqual was used where assertIn should have been. assertIn
will provide a more useful error message.

Change-Id: I97ccbb8579ea726fd76c520d0573fdcbf5a261d7
test_v3_token_id correctly hash token

The test_v3_token_id test was calculating the token hash by
parsing the response JSON and generating a new JSON document.
This isn't guaranteed to work because a Python dict can have its
fields in any order[1], so the new JSON document may not match the
response JSON and you'd get a different hash. The correct way to
generate a token hash is to use the response as is.

[1] http://docs.python.org/2/library/stdtypes.html#dict.items

Change-Id: I1a79c252916c4459fdc75a6e022d72c0c14582ef
Merge "test_v3_token_id correctly hash token"
Merge "Use assertIn in test_v3_catalog"