[Reviewer: Mike] Don't require split-horizon DNS

Mike,

Please can you review my fix to use the public hostname when communicating on the untrusted port and the local hostname when communicating on the trusted port?  I've updated UTs and live tested both using the scripts and manually.

Matt