[Review Andy] Fixes #210 - try registration store lookup with supplied URI if HSS look-up fails