Merge MC-32145 into 2.3.5-bugfixes-031320

Author: dvoskoboinikov

app/code/Magento/Wishlist/Setup/Patch/Data/CleanUpData.php

@@ -58,7 +58,7 @@ public function __construct(
         $this->json = $json;
         $this->queryGenerator = $queryGenerator;
         $this->queryModifierFactory = $queryModifierFactory;
-        $this->adapter = $resourceConnection->getConnection();
+        $this->adapter = $resourceConnection;
     }
 
     /**
@@ -68,19 +68,20 @@ public function apply()
     {
         $wishListItemOptionTable = $this->adapter->getTableName('wishlist_item_option');
         $select = $this->adapter
+            ->getConnection()
             ->select()
             ->from(
                 $wishListItemOptionTable,
                 ['option_id', 'value']
             );
         $iterator = $this->queryGenerator->generate('option_id', $select, self::BATCH_SIZE);
         foreach ($iterator as $selectByRange) {
-            $optionRows = $this->adapter->fetchAll($selectByRange);
+            $optionRows = $this->adapter->getConnection()->fetchAll($selectByRange);
             foreach ($optionRows as $optionRow) {
                 $rowValue = $this->json->unserialize($optionRow['value']);
                 unset($rowValue['login']);
                 $rowValue = $this->json->serialize($rowValue);
-                $this->adapter->update(
+                $this->adapter->getConnection()->update(
                     $wishListItemOptionTable,
                     ['value' => $rowValue],
                     ['option_id = ?' => $optionRow['option_id']]