Additional swift storage service mappings

Change-Id: I07ad7a5b175bf7730e9425a66122c63477fb5e21
Merge "Additional swift storage service mappings"