Merge branch 'releases/2.1.0' into develop

Prepping 2.1.0 release
Bump version

- reflect 2.2.0 dev status
Merge branch 'hotfix/composer-alias' into develop

Conflicts:
	README.md
	library/Zend/Version/Version.php
Merge branch 'hotfix/3611' into develop

Forward port #3611
Merge branch 'hotfix/3616' into develop

Forward port #3616
Forward port #3620
Forward port #3621
Forward port #3644
Forward port #3630
Forward port #3648
Forward port #3649
Forward port #3642
Merge branch 'hotfix/travis-exit-codes' into develop

Fixes build script to properly report both test and CS failures.
Merge branch 'hotfix/travis-build-status-codes' into develop

Fixes for travis build status
Merge branch 'weierophinney-hotfix/3650' into develop
Merge branch 'weierophinney-hotfix/3625' into develop
Merge branch 'develop' of https://github.com/dmakovec/zf2