Use templates for the search dialog and results
Merge with Master
Merge pull request #3324 from TomMalbran/tom/find-in-files-p1

[OPEN] Find in Files Improvements (Part 1: Templates)
Fix problem with finding next token on next line.
Don't set the selection until we have done the final jump-to-def
should address comments in issue #3863
Merge pull request #4294 from eztierney/iss-3863

Fix problem with finding next token on next line.
Updated by ALF automation.