Better upstream routing logic
Merge pull request #272 from Metaswitch/fix-pstn-inbound

Reviewer Mike - Better upstream routing logic