Conflicts:
	library/Solarium/QueryType/Select/Query/Query.php

[composer] Loosen symfony/event-dispatcher constraint

* Some Solr configurations have complex queries
  defined in solrconfig.xml with custom parameters,
  because of this, you might not always want the
  'q' parameter sent, this patch allows you to set
  'query' to NULL so that when you do it prevents
  'q' from being sent at all.

Conflicts:
	library/Solarium/Client.php
	tests/Solarium/ClientTest.php

Set the correct options on the adapter when using setAdapter.

Conflicts:
	composer.json

This modifies setAdapter to use the 'adapteroptions' option
introduced by commit bb14ee6b.

Update composer.json

Conflicts:
	library/Solarium/Client.php
	library/Solarium/Core/Client/Adapter/ZendHttp.php
	library/Solarium/Core/Client/Request.php

Conflicts:
	library/Solarium/Client/Request.php