[rackspace|identity] added error handling to make service catalog more robust.
[rackspace|identity] fixing broken service catalog test
[rackspace|monitoring] fixing broken monitoring test
Merge pull request #2047 from rackspace/hard_catalog

[rackspace|identity] Added error handling to service catalog