added some defensiveness to cross-wiki search grouping instantiation
Merge branch 'refactor-search-resultsets' into crossWikiSearchRedesign