Don't require split-horizon DNS - use public hostname when communicating on untrusted port and local hostname when communicating on trusted port
Code review mark-ups
Merge pull request #254 from Metaswitch/dont_require_split_horizon_dns

[Reviewer: Mike] Don't require split-horizon DNS
Fix UTs (broken by interaction between two recent merges)
Merge pull request #256 from Metaswitch/ut_fix

[No review required] Fix UTs (broken by interaction between two recent merges)