Tests for interactions between ENUM lookup and terminating services
Fix ordering of ENUM lookup and terminating services
Fix indentation
Fix indentation again
Clean up new UT
Correct comment in UT
Code review feedback - avoiding wasted work when failing ENUM lookup
Correct the test for doing an ENUM lookup
Merge pull request #195 from Metaswitch/enum_ordering

{Reviewer: Mike} Enum ordering