Markups
Merge pull request #783 from Metaswitch/tel_uris

[Reviewer: EM] Tel uris
Merge tel_uris branch
Merge tel_uris branch
Fix minor error
Update UTs for routing tel URIs to BGCF after failed ENUM lookup