Merge "Make create_server use **kwargs"