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
Merge "Fix state modifying catalog tests"