Allow specification of error message via Factory

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

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

Forward port #4117

Conflicts:
	tests/ZendTest/InputFilter/FactoryTest.php
Merge pull request #4104 from bakura10/option-factory

Allow to change option creations for plugin manager
Add interface
Merge pull request #4104 from bakura10/option-factory

Allow to change option creations for plugin manager
Merge branch 'feature/4104' into develop

Close #4104
Fix name of variable used for capturing output when executing a shell command
Merge branch 'hotfix/4118'

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

Forward port #4118
Fix weird verbalization
Merge branch 'hotfix/4119'

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

Forward port #4119
Merge pull request #4123 from bartmcleod/fix#3373

Fix#3373
[#4123] CS fixes

- EOF ending
Merge branch 'hotfix/4123'

Close #4123
Fixes #3373
Merge branch 'hotfix/4123' into develop

Forward port #4123
Merge pull request #4129 from BinaryKitten/ServiceManagerErrorUpdate

Update to ServiceManager to provide more precise error messages
Merge branch 'hotfix/4129'

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

Forward port #4129