Revert "Merge branch 'superdweebie-rand-bugfix'"

This reverts commit 002ce3dee6107f2c71af8e7ce0ed1f43693ddadf, reversing
changes made to 0023a96e4756112661c11dbf4e293f4be110809a.

Note: we will need to revert this revert when merging develop to master for the
2.3.0 release. See http://git-scm.com/blog/2010/03/02/undoing-merges.html - the
section on "Reverting the Revert," for details.
Fix CS
Merge remote-tracking branch 'origin/patch-1' into patch-1
Un-revert change to ModuleEvent

- re-add EVENT_MERGE_CONFIG, per
  https://github.com/zendframework/zf2/blob/78eaad03cb25aa89e448beaad55cdbb6fe1227fc/library/Zend/ModuleManager/ModuleEvent.php#L23-L27
Merge pull request #4851 from trueaxiom/issue4801

allow usage of validator and filter plugin managers in input filter factory if form manager injected

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

Close #4851
Revert "Revert "Merge branch 'superdweebie-rand-bugfix'""

This reverts commit b0ae4689135d62555cf9bbe55cdd7dddcd2d8f05 in order to allow
forward-porting fixes to develop.

Conflicts:
	library/Zend/ModuleManager/ModuleEvent.php
Merge branch 'hotfix/4851' into develop

Forward port #4851
Merge pull request #4871 from mtorromeo/patch-1

Use .eml extensions for emails stored with Zend\Mail\Transport\File
Merge branch 'feature/4871' into develop

Close #4871
Merge pull request #4877 from stefanotorresi/fix/validator-file-tests

Validator\File tests throwing errors in custom PHP 5.3.10 distributions
Merge branch 'hotfix/4877'

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

Forward port #4877
CS fixes

- trailing whitespace
Merge pull request #4881 from stefanotorresi/update/validator-translations

Update Validator translations
Merge branch 'hotfix/4881'

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

Forward port #4881
Merge pull request #4883 from cobyl/patch-1

Update Zend_Validate.php
Merge branch 'hotfix/4883'

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

Forward port #4883