Remove merge artifacts
Update providers and results to work with merged changes
Add functionality to OC\Files\View to return all results when given a '*' search query

This change is required for the advanced search app to work.