Merge "Uncanonicalize URIs before comparing them." into pi-dev