Merge "Fix SearchEngineTest when $wgSearchType is set to non-default"