merge with upstream changes

services/sync/modules/wrap.js

@@ -118,7 +118,7 @@ let Wrap = {
       let ret;
       let args = Array.prototype.slice.call(arguments);
 
-      let ret = this.lock();
+      ret = this.lock();
       if (!ret)
         throw "Could not acquire lock";