Skip combining highlights correctly

The old code worked but it tried to combine highlights using the plain
highlighter which doesn't work.

Change-Id: I18a52d07f14cc76b70ad7f498ef3e3da6dd22bf8
Refactor Connection::getPageType()

Make callers specify the base name of the index at all
times, swap param order as a result.

Change-Id: Ife0aad9415b030a499d964a5a28afff622745daa
Merge "Refactor Connection::getPageType()"
Merge "Skip combining highlights correctly"