MC-18527: Merge release branch into 2.3-develop

- fix merge conflict

Author: krissyhiserote

dev/tests/integration/testsuite/Magento/Sales/_files/quotes.php

@@ -8,7 +8,6 @@
 use Magento\Store\Model\StoreRepository;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteRepository;
-use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;