Merge branch 'rs-trailing-slash-in-search' into 'master'

Escape the query argument provided to `git grep` by `search_files`

Closes #14963.

See merge request !3633