Revert "Revert "328630: ensure canonical URIs are used as map keys""

This reverts commit e0ec8899a6da4dacb45bad3bb4ceb999fbf5d6eb.
1 file changed