Improve HSS interop
Fix UT
Code review mark-ups
Merge pull request #123 from Metaswitch/hss-interop

[Reviewer: Andy] Improve HSS interop