Please enable Advance Search scope configurable to 'Repository' or 'All Sites' and make the selection persist

This request is to revert SHA-1754

[Description]:
In 5.2.2, when using the Basic Search, the scope of the search is

1. configurable - the dropdown allows the user to choose either 'all sites' or 'repository'
2. persistent - the user selection - whether 'repository' or 'all sites'- persists
3. defaults to 'all sites'

However, when using the Advanced Search, when users type in keywords, the search scope defaults to 'all sites', but from Advanced Search, there is no way to configure the scope. We currently provide 'content' or 'folders' filter options, but the scope defaults to 'all sites' instead of 'repository'.

Customer would like to have a selection so they can limit the result to either 'sites' or 'repository' in the Advanced Search page, along with the current selection of 'content' and 'folder' and keep the selection persist.

[Steps to reproduce]:
1. Display a site dashboard
2. Click on the Advanced Search button (top right of screen to left of search field)
2. Enter a search term into the keywords field
3. Click on search

[Expected Behaviour]:
The advanced search is executed against the whole repository.

[Observed Behaviour]:
The advanced search should be restricted to All site.