Replace storage-url with service-catalog

Replacing storage url with a base 64 encoded service catalog obtained from identity.
This change is required in order to run the tests when the swift driver is used in deuce
There was a bug in the code that has been fixed. Tests were broken which is why it wasn't revealed.