Add volume type support to sahara

Change-Id: Ic72556f436fc5202e3958e0495db119d4ad42a0a
Closes-bug: #1369574
Merge "Add volume type support to sahara"