CAL-824 merge master -> stabilization
UI-2815:  Answer icon is too small in Search Result Suggestion
Merge branch 'feature/stabilization'
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ