Merge "Make security_group_rules_client use **kwargs"