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