Updates for DNS SRV fix.
Merge remote-tracking branch 'origin/topic/seth/dns-srv-fix'