CAL-824 merge master -> stabilization
UI-2815:  Answer icon is too small in Search Result Suggestion
Merge branch 'feature/stabilization'
Merge branch 'master' into feature/upgrade-gatein-3.7.x