CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes.
CLOUDSTACK-3647: Remove duplicate row
Reviewed-by: Alena Prokharchyk