CS-4921: Adds usage of LinkService in SearchService
Merge remote-tracking branch 'upstream/master' into CS-4921-1
Merge pull request #537 from m038/CS-4921-1

Cs 4921 1