Add settings to links.
More work.
Pushing fixes.
Merge branch '5481-1' into 5481

Conflicts:
	openscholar/modules/os/modules/os_search_solr/os_search_solr.module