{Reviewer: Mike} Enum ordering

Fixes https://github.com/Metaswitch/sprout/issues/88

Mike, this is the fix we discussed, which will do the ENUM lookup before applying terminating services. I added a new UT to expose the error, then fixed it.