Merge "Make image_client use **kwargs"