Merge "Add option to support volume_type in volume creation"