MC-8972: Register customer with image upload

fixed merge issues

Author: soumyau

app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml

@@ -20,6 +20,7 @@
         <click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="deleteCustomer"/>
         <waitForPageLoad stepKey="waitForConfirmationAlert"/>
         <click selector="{{AdminCustomerGridMainActionsSection.ok}}" stepKey="acceptDeletion"/>
+        <waitForPageLoad stepKey="waitForDelete"/>
         <see userInput="were deleted." stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml

@@ -14,7 +14,7 @@
         <element name="emailInput" type="input" selector="input[name=email]"/>
         <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
         <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
-        <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
         <element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear" timeout="30"/>
+        <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
     </section>
 </sections>