Merge pull request #511 from peternewman/e1.37-2

Use the instance name for the DNS-SD, finally close #473