SE-278 removed search highlighting feature since we don't use it anymore
code formatting
code clean up
more code clean up
Merge branch 'master' into dev-SE-278
Merge branch 'dev-SE-278' into release-2.7.7rc