Merge branch 'MAGETWO-49021' of https://github.corp.magento.com/magento-tango/magento2ce into MAGETWO-48913

Author: shiftedreality

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php

@@ -579,6 +579,7 @@ protected function customizeAdvancedPricing()
             'componentType' => Modal::NAME,
             'dataScope' => '',
             'provider' => 'product_form.product_form_data_source',
+            'onCancel' => 'actionCancel',
             'options' => [
                 'title' => __('Advanced Pricing'),
                 'buttons' => [

app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

@@ -11,6 +11,7 @@
             <item name="config" xsi:type="array">
                 <item name="dataScope" xsi:type="string">data.product</item>
                 <item name="provider" xsi:type="string">product_form.product_form_data_source</item>
+                <item name="onCancel" xsi:type="string">actionCancel</item>
                 <item name="options" xsi:type="array">
                     <item name="title" xsi:type="string">Advanced Inventory</item>
                     <item name="buttons" xsi:type="array">