Merge remote-tracking branch 'origin/MAGETWO-97355' into 2.2-develop-pr65

Author: zakdma

app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml

@@ -155,10 +155,9 @@
         <!--Create new order-->
         <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="startToCreateNewOrder">
             <argument name="customer" value="$$createCustomer$$"/>
+            <argument name="storeView" value="SecondStoreUnique"/>
         </actionGroup>
-        <click selector="{{AdminOrderFormSelectWebsiteSection.website(SecondStoreUnique.name)}}" stepKey="selectStore"/>
-        <waitForPageLoad stepKey="waitForPageOpened"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+
         <click  selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickToAddProduct"/>
         <waitForPageLoad stepKey="waitForProductsOpened"/>
         <!--TEST CASE #1-->

app/code/Magento/Reports/Test/Mftf/Test/AdminTaxReportGridTest.xml

@@ -77,8 +77,6 @@
         <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="createNewOrder">
             <argument name="customer" value="$$createCustomer$$"/>
         </actionGroup>
-        <!--Select default store view (in multi-store website)-->
-        <conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(_defaultStore.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeForOrder(_defaultStore.name)}}" visible="true" stepKey="chooseStoreView" />
         <!--Add product to order-->
         <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder">
             <argument name="product" value="$$createSimpleProduct$$"/>