Merge branch 'hotfix/4111'

Close #4111
Allow specification of error message via Factory

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

Forward port #4117

Conflicts:
	tests/ZendTest/InputFilter/FactoryTest.php