Merge branch 'MAGETWO-49091' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-43102

Author: slopukhov

dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/FormPageActions.php

@@ -19,7 +19,7 @@ class FormPageActions extends PageActions
      *
      * @var string
      */
-    protected $saveAndApplyButton = '#save_apply';
+    protected $saveAndApplyButton = '#save_and_apply';
 
     /**
      * Click on "Save and Apply" button

dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.xml

@@ -30,7 +30,8 @@
         <strategy>xpath</strategy>
         <fields>
             <conditions>
-                <selector>#catalog_rule_formrule_conditions_fieldset_</selector>
+                <selector>//fieldset[contains(@id,"conditions")]</selector>
+                <strategy>xpath</strategy>
                 <input>conditions</input>
             </conditions>
         </fields>

dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.php

@@ -44,7 +44,6 @@ class CreateCatalogRuleTest extends AbstractCatalogRuleEntityTest
      */
     public function testCreate(CatalogRule $catalogPriceRule, $product, $conditionEntity, Customer $customer = null)
     {
-        $this->markTestIncomplete('MAGETWO-48731');
         /** @var CatalogProductSimple $productSimple */
         $productSimple = $this->fixtureFactory->createByCode('catalogProductSimple', ['dataset' => $product]);
         // Prepare data