Update search to use new pre-combined indexes + local docs support#1586

derickr merged 2 commits intophp:masterphp/web-php:masterfrom

AllenJB:search-combined-indexesAllenJB/web-php:search-combined-indexesCopy head branch name to clipboard