Merge "Make volumes_extensions_client use **kwargs"