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.
[2.1.0] Release updates

- Updated CHANGELOG
- Updated README
- Updated Zend\Version
Merge branch 'releases/2.1.0'

Prepping for 2.1.0 release
Merge branch 'releases/2.1.0' into develop

Prepping 2.1.0 release
Bumped version

- reflects development status
Merge branch 'version/bump'
Bump version

- reflect 2.2.0 dev status
Include ParameterContainer as an option for the 
second parameter of Query.

Fixed unit test
testQueryWhenPreparedWithParameterContainerProducesResult.
Fix branch-alias for composer

- dev-master is now 2.1-dev, dev-develop is now 2.2-dev
Merge branch 'hotfix/composer-alias'
Merge branch 'hotfix/composer-alias' into develop

Conflicts:
	README.md
	library/Zend/Version/Version.php
Fix validate data contains arrays as values
Rely on specific setter
Added missing return
Fix bug when $indent have some string

assuming $ident = '¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨';
before:
¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨<script type="text/javascript">
¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨    //<!--
¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨    Some script here...¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨
    //-->
¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨</script>

now:
¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨<script type="text/javascript">
¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨    //<!--
¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨    Some script here...
¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨    //-->
¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨</script>
Merge branch 'hotfix/3611'

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

Forward port #3611