Merge "Make volume snapshots_client to use **kwargs"