Merge "Make volume_qos_client use **kwargs"