Fixed inheritance hierarchy for Swift and Cloud Files to avoid problems when using BlobStore.
Merge pull request #1330 from rackspace/1.5.x

Fixed inheritance hierarchy for Swift and Cloud Files to avoid problems when using BlobStore.