make wikiasearchindexer respect canonical page id
Merge branch 'canonicalfix' into release-149