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

Author: shiftedreality

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePrice.php

@@ -63,6 +63,7 @@ public function modifyMeta(array $meta)
                             'sortOrder' => self::SORT_ORDER,
                             'formElement' => Form\Element\Checkbox::NAME,
                             'componentType' => Form\Field::NAME,
+                            'label' => __('Dynamic Price'),
                             'prefer' => 'toggle',
                             'additionalClasses' => 'admin__field-x-small',
                             'templates' => ['checkbox' => 'ui/form/components/single/switcher'],

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php

@@ -30,7 +30,7 @@ class Options extends Section
      *
      * @var string
      */
-    protected $newCustomOptionRow = '[data-index="custom_options"] [data-role="grid"] tbody tr:nth-child(1)';
+    protected $newCustomOptionRow = '[data-index="custom_options"] [data-role="grid"] tbody tr:nth-child(%d)';
 
     /**
      * Add an option button.

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php

@@ -294,7 +294,9 @@ public function addNewAttribute($sectionName = 'product-details')
             $this->openSection($sectionName);
             $section->addNewAttribute($sectionName);
         } else {
-            throw new \Exception("$sectionName hasn't 'Add attribute' button or is not instance of ProductSection class.");
+            throw new \Exception(
+                "$sectionName hasn't 'Add attribute' button or is not instance of ProductSection class."
+            );
         }
     }
 }