Merge remote-tracking branch 'origin/checkout' into checkout

app/code/Magento/Downloadable/etc/events.xml

@@ -12,4 +12,7 @@
     <event name="sales_order_save_commit_after">
         <observer name="downloadable_observer" instance="Magento\Downloadable\Model\Observer" method="setLinkStatus" />
     </event>
+    <event name="sales_model_service_quote_submit_success">
+        <observer name="checkout_type_onepage_save_order_after" instance="Magento\Downloadable\Model\Observer" method="setHasDownloadableProducts" />
+    </event>
 </config>

app/code/Magento/Downloadable/etc/frontend/events.xml

@@ -6,9 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
-    <event name="sales_model_service_quote_submit_success">
-        <observer name="checkout_type_onepage_save_order_after" instance="Magento\Downloadable\Model\Observer" method="setHasDownloadableProducts" />
-    </event>
     <event name="checkout_type_multishipping_create_orders_single">
         <observer name="checkout_type_multishipping_create_orders_single" instance="Magento\Downloadable\Model\Observer" method="setHasDownloadableProducts" />
     </event>