Merge "Update cinder storage type for vPOD"