Merge branch 'feature/3598' into develop

Close #3598
Merge branch 'feature/db-sql-literal-type' of git://github.com/ralphschindler/zf2 into feature/3599
[#3599] CS fixes

- EOF ending
Merge branch 'feature/3599' into develop

Close #3599
Update tests/ZendTest/Db/Adapter/AdapterTest.php

Added missing import of Zend\Db\Adapter\ParameterContainer.
Merge branch 'patch-1' of git://github.com/mwillbanks/zf2 into feature/3601
Update library/Zend/Db/Adapter/Adapter.php

Allow $parametersOrQueryMode to be a ParameterContainer object.
Merge branch 'feature/3601'

Close #3601
Merge branch 'feature/3601' into develop

Forward port #3601
Zend\Log\Logger::registerErrorHandler: Log previous exceptions and map severity of ErrorExceptions to priority + tests
Restore Zend\File\Transfer

- A user was able to display use cases for Zend\File\Transfer that were indeed
  working on the master branch prior to the file upload rewrite provided by
  @cgmartin
- This commit restores the files from master, and provides fixes/updates/etc. to
  ensure they work against the develop branch for 2.1.0.
[#3605] Ensure InputFilter component is updated

- FileInput needs to use new UploadFile validator, not old Upload
  validator
- Ensure tests also are using correct validator
Zend\Db\Sql\Select - #2881
- Added support for joining a subselect
Merge branch 'hotfix/ExceptionHandlerDoesntLogPreviousExceptions' of git://github.com/marc-mabe/zf2 into hotfix/3604
[#3604] CS and logic cleanup

- Extract common error priority map to static property
- Use descriptive names instead of abbreviations
Merge branch 'hotfix/3604'

Close #3604
Merge branch 'hotfix/3604' into develop

Forward port #3604

Conflicts:
	library/Zend/Log/Logger.php
	tests/ZendTest/Log/LoggerTest.php
Merge branch 'feature/db-subselect-in-join-from' of git://github.com/ralphschindler/zf2 into feature/3606
Merge branch 'feature/3606' into develop

Close #3606
Fixes #2881
Fixes #2884
Merge branch 'develop'

Preparing to tag 2.1.0 -- all new features from develop are now merged to master.