Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-59114

app/code/Magento/CatalogInventory/Model/Stock/Status.php

@@ -100,7 +100,7 @@ class Status extends AbstractExtensibleModel implements StockStatusInterface
      */
     public function getStockId()
     {
-        return $this->getData(self::KEY_WEBSITE_ID);
+        return $this->getData(self::KEY_STOCK_ID);
     }
 
     /**

app/code/Magento/Paypal/Model/Config.php

@@ -866,7 +866,7 @@ class Config extends AbstractConfig
      */
     public function getExpressCheckoutStartUrl($token)
     {
-        return sprintf('https://www.%spaypal.com/checkoutnow/2%s',
+        return sprintf('https://www.%spaypal.com/checkoutnow%s',
             $this->getValue('sandboxFlag') ? 'sandbox.' : '',
             '?token=' . urlencode($token));
     }

app/code/Magento/Vault/Setup/UpgradeData.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Vault\Setup;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
@@ -16,13 +19,18 @@ use Magento\Vault\Model\CreditCardTokenFactory;
  */
 class UpgradeData implements UpgradeDataInterface
 {
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
     /**
      * @inheritdoc
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
         $setup->startSetup();
-        $connection = $setup->getConnection();
+        $connection = $this->getConnection();
 
         // data update for Vault module < 2.0.1
         if (version_compare($context->getVersion(), '2.0.1', '<')) {
@@ -59,4 +67,23 @@ class UpgradeData implements UpgradeDataInterface
 
         $setup->endSetup();
     }
+
+    /**
+     * Tries to get connection for scalable sales DB, otherwise returns default connection
+     * @return AdapterInterface
+     */
+    private function getConnection()
+    {
+        if ($this->connection === null) {
+            /** @var ResourceConnection $conn */
+            $conn = ObjectManager::getInstance()->get(ResourceConnection::class);
+            try {
+                $this->connection = $conn->getConnectionByName('sales');
+            } catch (\DomainException $e) {
+                $this->connection = $conn->getConnection();
+            }
+        }
+
+        return $this->connection;
+    }
 }