Merge "Create deleted server in resource_setup"