Use formatted display text when sorting facets so that sorting works properly also when some but not all of the facet values have translations.
Merge branch 'hierarchical-facets3'