Advanced search control links now on their own line.
Merge branch 'release-2.3'

Conflicts:
	themes/bootstrap3/templates/search/searchbox.phtml