Merge "Make fixed_ips_client use **kwargs"