Merge "Make volume volume_client to use **kwargs-part2"