Merge "Make volume_types_client use **kwargs"