Merge remote-tracking branch 'origin/MAGETWO-73062' into 2.2-develop-pr36

Author: zakdma

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml

@@ -20,6 +20,8 @@
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
+            <createData entity="WeeeConfigDisable" stepKey="disableFPT"/>
             <createData entity="SimpleProduct3" stepKey="simpleProduct1"/>
             <createData entity="SimpleProduct3" stepKey="simpleProduct2"/>
         </before>

app/code/Magento/Weee/Test/Mftf/ActionGroup/AdminProductAddFPTValueActionGroup.xml

@@ -15,6 +15,7 @@
             <argument name="stateForFPT" type="string"/>
             <argument name="valueForFPT" type="string"/>
         </arguments>
+        <scrollToTopOfPage stepKey="scrollToTopOfThePageToShowAttributeEditor"/>
         <click selector="{{AdminProductAddFPTValueSection.addFPT(FPTAttributeCode)}}" stepKey="clickAddFPTButton1"/>
         <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
         <selectOption selector="{{AdminProductAddFPTValueSection.selectCountryForFPT(FPTAttributeCode)}}" userInput="{{countryForFPT}}" stepKey="selectcountryForFPT"/>