dns-server - use include_wrappers, sync the patch with upstream
Merge pull request #496 from lslezak/dns-server_include_wrappers

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