Merge remote-tracking branch 'origin/MAGETWO-91019' into 2.2-develop-pr59

Author: zakdma

app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml

@@ -13,5 +13,6 @@
         <data key="attributeSetId">4</data>
         <data key="attributeGroupId">7</data>
         <data key="sortOrder">0</data>
+        <data key="label">Default</data>
     </entity>
 </entities>

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateConfigurableProductActionGroup.xml

@@ -62,6 +62,7 @@
         <!-- Save the product -->
         <click selector="{{AdminProductFormActionSection.saveArrow}}" stepKey="openSaveDropDown"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSave"/>
+        <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" visible="true" stepKey="clickConfirm"/>
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="assertSuccess"/>
     </actionGroup>
 </actionGroups>