Merge branch 'patch-1' of https://github.com/gerardroche/zf2 into hot…

…fix/2372

src/Config.php

@@ -61,9 +61,10 @@ public function getShared()
 
     public function configureServiceManager(ServiceManager $serviceManager)
     {
-        $allowOverride = $this->getAllowOverride();
-        isset($allowOverride) ? $serviceManager->setAllowOverride($allowOverride) : null;
-
+        if (($allowOverride = $this->getAllowOverride()) !== null) {
+            $serviceManager->setAllowOverride($allowOverride);
+        }
+
         foreach ($this->getFactories() as $name => $factory) {
             $serviceManager->setFactory($name, $factory);
         }