Merge remote-tracking branch 'origin/MC-15360' into 2.2-develop-pr88

Author: zakdma

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -609,7 +609,7 @@ private function rollbackAddresses(
         QuoteEntity $quote,
         \Magento\Sales\Api\Data\OrderInterface $order,
         \Exception $e
-    ): void {
+    ) {
         try {
             if (!empty($this->addressesToSync)) {
                 foreach ($this->addressesToSync as $addressId) {