Use canonical URLs (introduced in r94995) in the OpenSearch discovery thingy