DDBNEXT923: Add highlighting support for non i18n-based facets
Merge branch 'DDBNEXT-923-BOZ' into develop