Import mDNSResponder-258-14 as per discussion with gdt@ and cristos@