Update tests/ZendTest/Db/Adapter/AdapterTest.php

Added unit tests for parametersOrQueryMode param of Zend\Db\Adatper\Adapter::Query
Testing input array and input ParameterContainer.
Update tests/ZendTest/Db/Adapter/AdapterTest.php

Added missing import of Zend\Db\Adapter\ParameterContainer.
Update library/Zend/Db/Adapter/Adapter.php

Allow $parametersOrQueryMode to be a ParameterContainer object.
Include ParameterContainer as an option for the 
second parameter of Query.

Fixed unit test
testQueryWhenPreparedWithParameterContainerProducesResult.
Merge branch 'weierophinney-hotfix/restful-head-identifier'
Merge branch 'master' of git://github.com/chrishiebert/zf2 into chrishiebert-master
Merge branch 'chrishiebert-master' into develop