Merge branch '2.2.1-develop' into PR-bugfixes

Author: Dmytro Voskoboinikov

app/code/Magento/Quote/Setup/UpgradeSchema.php

@@ -48,17 +48,17 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
         }
         //drop foreign key for single DB case
         if (version_compare($context->getVersion(), '2.0.3', '<')
-            && $setup->tableExists($setup->getTable('quote_item'))
+            && $setup->tableExists($setup->getTable('quote_item', self::$connectionName))
         ) {
-            $setup->getConnection()->dropForeignKey(
-                $setup->getTable('quote_item'),
+            $setup->getConnection(self::$connectionName)->dropForeignKey(
+                $setup->getTable('quote_item', self::$connectionName),
                 $setup->getFkName('quote_item', 'product_id', 'catalog_product_entity', 'entity_id')
             );
         }
         if (version_compare($context->getVersion(), '2.0.5', '<')) {
-            $connection = $setup->getConnection();
+            $connection = $setup->getConnection(self::$connectionName);
             $connection->modifyColumn(
-                $setup->getTable('quote_address'),
+                $setup->getTable('quote_address', self::$connectionName),
                 'shipping_method',
                 [
                     'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,