dns-server - use include_wrappers, sync the patch with upstream