Merge "Make security_groups_client use **kwargs"