Fix state modifying catalog tests

Some of the service catalog tests modify the global state. They should
take a copy of the dictionary before modifying it.

Change-Id: I5de52949d561322958f603022af893f087c55e03
Fix retry logic

When passing retry=True to verify_uuid_token this later should
re-call it self when the method fail and this time with retry=False.

Change-Id: I7e8f478e5116ac4119df134587f29f3f25ae8a42
Closes-Bug: #1285847
Updated from global requirements

Change-Id: I8df925dc23eaae9d6866ad9dffbb4f255fedf1ab
Merge "Fix retry logic"
Merge "Fix state modifying catalog tests"