Merge "Construct clean canonical URLs for wiki pages, ignoring request URL"