Merge branch 'hotfix/2834' into develop

Forward port #2834
Merge branch 'hotfix/2850' into develop

Forward port #2850
Merge pull request #2805 branch 'hotfix/fix-docblock'
Merge branch 'add-paginator-factory' of git://github.com/blanchonvincent/zf2 into feature/paginator-factory

Conflicts:
	library/Zend/Mvc/Service/ServiceListenerFactory.php
Merge branch 'feature/paginator-factory' into develop

Close #2316
Merge branch 'feature/cache/xcache' of git://github.com/marc-mabe/zf2 into feature/xcache

Conflicts:
	tests/ZendTest/Cache/Storage/Adapter/CommonAdapterTest.php
[#2668][#2581] Do not enable xcache tests by default
Merge branch 'feature/logger-factory' of git://github.com/stefankleff/zf2 into feature/log-factory
Merge branch 'feature/log-factory' into develop

Close #2725
Merge branch 'feature/log-processors' of git://github.com/stefankleff/zf2 into feature/log-processors

Conflicts:
	library/Zend/Log/Logger.php
	tests/ZendTest/Log/LoggerTest.php
[#2727] CS review

- indentation
- trailing whitespace
- object calisthenics
[#2727] CS review

- Trailing whitespace
- Cache generated value, as it will not change in lifetime of request
Merge branch 'feature/log-processors' into develop

Close #2727
Merge branch 'feature/route-access' of git://github.com/stefankleff/zf2 into feature/route-retrieval
Merge branch 'feature/route-retrieval' into develop

Close #2783
Fixes #2495
Merge branch 'hotfix/2790' into develop

Forward port #2790
Merge branch 'hotfix/zend-soap-fault' into develop
Merge branch 'hotfix/2791' into develop

Forward port #2791
Merge branch 'hotfix/2793' into develop

Forward port #2793
Merge branch 'code' of git://github.com/prolic/zf2 into feature/token-scanner-namespaces

Conflicts:
	library/Zend/Code/Scanner/TokenArrayScanner.php