gracefully handle xri:// in canonicalid
Merge branch 'master' of https://github.com/projectdanube/xdi2.git