Issue #2288867 by larowlan: Fixed Search results built twice when using search pages with a search box.

Conflicts:
	apachesolr_search.pages.inc
updated CHANGELOG