Merge branch 'hotfix/3328' into develop

Forward port #3328
Fixed so that Zend/Mvc/Router/Http/Segment is fully extendable
Added missing Exception namespace to Sha1 validator
Merge branch 'master' into 2574
Add test for Translator
Add unit tests for Collection element extract
Fix CS
Merge branch 'hotfix/3081'

Close #3081
Fix #2574
Merge branch 'hotfix/3081' into develop

Forward port #3081

Conflicts:
	library/Zend/Form/Element/Collection.php
	tests/ZendTest/Form/Element/CollectionTest.php
else isn't needed, as the previous block returns on completion + removed call to strlen if length of padding is less than or equal 0
StringWrapper::convert() Renamed second argument  to  and fixed phpdoc
Merge branch 'master' of git://github.com/neilime/zf2 into hotfix/3262
phpdoc
Merge branch 'hotfix/3262' into develop

Close #3262
Merge branch 'patch-2' of git://github.com/mtorromeo/zf2 into hotfix/3272
Merge branch 'hotfix/3272'

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

Forward port #3272
Added missing @deprecated
The native string wrapper doesn't support to convert between encodings
Added note why encodings are typed in case-mix