Merge pull request #4077 from sjuvonen/master

Fix Collection form element replacing bound objects with dummies upon form validation
[#4077] CS fixes

- braces
Merge branch 'hotfix/4077'

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

Forward port #4077
Merge pull request #4098 from samsonasik/fix/docblock.bool

fix php docblock : boolean should be bool

Conflicts:
	library/Zend/Filter/File/RenameUpload.php
	library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
	library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
	library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
	library/Zend/Mvc/Router/SimpleRouteStack.php
[#4098] CS fixes

- linefeed
Merge branch 'hotfix/4098' into develop

Close #4098
Merge pull request #4099 from samsonasik/fix/cast.bool

fix (bool) casting : add space and use (bool) instead of (boolean) to cast
Merge branch 'hotfix/4099' into develop

Close #4099
Merge pull request #4102 from sasezaki/validator_fileinfo_simplify_constants

simplify constant usage. FILEINFO_MIME_TYPE is available since PHP 5.3.0
Merge branch 'hotfix/4102'

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

Forward port #4102
Update doc block
Merge pull request #4111 from SGI495/master

Updated translations
[#4111] CS fixes

- trailing whitespace
Merge branch 'hotfix/4111'

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

Forward port #4111
Add interface
Allow specification of error message via Factory

Conflicts:
	tests/ZendTest/InputFilter/FactoryTest.php
Merge branch 'hotfix/4117'

Close #4117