Preserve SIP URI properly
Merge pull request #795 from Metaswitch/tel_uris2

Preserve SIP URI properly