Merge "Update definition of mdns server for macOS"