Merge "Make create_server_group use **kwargs"