TRUNK-4426 Search widget should find concepts by mappings

(cherry picked from commit 4be239e50f8b8fb7753cddb8558dd9251e7d9615)
TRUNK-4426 Reverting unrelated change to the search

(cherry picked from commit 64eec76a1b57338ddfdecf21e0a0747c1e2ad5ab)