[rackspace] fixing more live tests
Merge branch 'master' of github.com:fog/fog into test_fix6
Merge pull request #2354 from rackspace/test_fix6

[rackspace] fixing broken tests