Merge branch 'hotfix/3663' into develop

Forward port zendframework/zendframework#3663

src/ServiceManager.php

@@ -351,11 +351,10 @@ public function addInitializer($initializer, $topOfStack = true)
      *
      * @param  string  $name
      * @param  mixed   $service
-     * @param  bool    $shared
      * @return ServiceManager
      * @throws Exception\InvalidServiceNameException
      */
-    public function setService($name, $service, $shared = null)
+    public function setService($name, $service)
     {
         $cName = $this->canonicalizeName($name);
 
@@ -370,12 +369,8 @@ public function setService($name, $service, $shared = null)
             $this->unregisterService($cName);
         }
 
-        if ($shared === null) {
-            $shared = $this->shareByDefault();
-        }
-
         $this->instances[$cName] = $service;
-        $this->shared[$cName]    = (bool) $shared;
+
         return $this;
     }