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

composer.json

@@ -20,12 +20,13 @@
     "require-dev": {
         "zendframework/zend-servicemanager": "self.version",
         "zendframework/zendpdf": "*",
+        "zendframework/zend-validator": "self.version",
         "fabpot/php-cs-fixer": "1.7.*",
         "satooshi/php-coveralls": "dev-master",
         "phpunit/PHPUnit": "~4.0"
     },
     "suggest": {
-        "zendframework/zend-servicemanager": "Zend\\ServiceManager component, required when using the factory methods of Zend\\Barcode.",
+        "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
         "zendframework/zendpdf": "ZendPdf component",
         "zendframework/zend-validator": "Zend\\Validator component"
     },