Issue #2356913 by jmolivas, mgifford, maurizio.ganovelli, zhuber: Fix rebuild_token_calculator

core/scripts/rebuild_token_calculator.sh

@@ -15,11 +15,11 @@
   return;
 }
 
-require __DIR__ . '/../../autoload.php';
+$autoloader = require __DIR__ . '/../../autoload.php';
 require_once __DIR__ . '/../includes/bootstrap.inc';
 
 $request = Request::createFromGlobals();
-Settings::initialize(DrupalKernel::findSitePath($request));
+Settings::initialize(DRUPAL_ROOT, DrupalKernel::findSitePath($request), $autoloader);
 
 $timestamp = time();
 $token = Crypt::hmacBase64($timestamp, Settings::get('hash_salt'));