secure cookie error crash (#2685)

- fixes #1264 
- fixes #1321 
- fixes #1799  
- fixes #2689
- fixes #2688
- fixes #2687 	
- fixes #2686

cli/lib/exec/spawn.js

@@ -88,6 +88,7 @@ module.exports = {
         options.env = _.extend({}, options.env, overrides)
 
         const child = cp.spawn(executable, args, options)
+
         child.on('close', resolve)
         child.on('error', reject)
 
@@ -137,8 +138,9 @@ module.exports = {
       return xvfb.start()
       .then(userFriendlySpawn)
       .finally(xvfb.stop)
-    } else {
-      return userFriendlySpawn()
     }
+
+    return userFriendlySpawn()
+
   },
 }