Merge remote-tracking branch 'netinsight/remote-streaming-configurable'

Conflicts:
	README.rst
	collective/recipe/solrinstance/__init__.py