Merge "Allow kwargs in create_volume_type"