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

src/Storage/Adapter/Apc.php

@@ -734,4 +734,19 @@ protected function normalizeMetadata(array & $metadata)
             $metadata['num_hits']
         );
     }
+
+    /**
+     * Internal method to set an item only if token matches
+     *
+     * @param  mixed  $token
+     * @param  string $normalizedKey
+     * @param  mixed  $value
+     * @return bool
+     * @see    getItem()
+     * @see    setItem()
+     */
+    protected function internalCheckAndSetItem(& $token, & $normalizedKey, & $value)
+    {
+        return apc_cas($normalizedKey, $token, $value);
+    }
 }