Improve HSS interop - use correct vendor IDs and fix host IP address
Back out superfluous change
Merge pull request #121 from Metaswitch/hss_interop_fixes

[Reviewer: Andy] Improve HSS interop - use correct vendor IDs and fix host IP address