Merge branch '2.4-develop' of https://github.com/magento/magento2ce into MC-33823

� Conflicts:
�	app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
�	app/code/Magento/Braintree/view/adminhtml/templates/payment/script.phtml
�	app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
�	app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
�	app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml

Author: Oleksandr Gorkun

app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml

@@ -149,7 +149,6 @@
             <item>Magento_Backend::custom</item>
             <item>Magento_Backend::tools</item>
             <item>Magento_Backend::cache</item>
-            <item>Magento_Backend::setup_wizard</item>
             <item>Magento_Backup::backup</item>
             <item>Magento_Backup::rollback</item>
             <item>Magento_Indexer::index</item>

app/code/Magento/Analytics/etc/di.xml

@@ -163,11 +163,7 @@
                 <item name="27" xsi:type="string">payment/cashondelivery/active</item>
                 <item name="28" xsi:type="string">payment/paypal_billing_agreement/title</item>
                 <item name="29" xsi:type="string">payment/paypal_billing_agreement/active</item>
-                <item name="30" xsi:type="string">payment/braintree/title</item>
-                <item name="31" xsi:type="string">payment/braintree/active</item>
-                <item name="32" xsi:type="string">payment/braintree_paypal/title</item>
-                <item name="33" xsi:type="string">payment/braintree_paypal/active</item>
-                <item name="34" xsi:type="string">analytics/general/vertical</item>
+                <item name="30" xsi:type="string">analytics/general/vertical</item>
             </argument>
         </arguments>
     </type>

app/code/Magento/Backend/Model/Setup/MenuBuilder.php

@@ -53,7 +53,6 @@
                                 <resource id="Magento_Backend::flush_static_files" title="Flush Static Files" translate="title" sortOrder="30" />
                             </resource>
                         </resource>
-                        <resource id="Magento_Backend::setup_wizard" title="Web Setup Wizard" translate="title" sortOrder="20" />
                     </resource>
                     <resource id="Magento_Backend::system_other_settings" title="Other Settings" translate="title"  sortOrder="80" />
                 </resource>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateToSetupWizardPageActionGroup.xml

@@ -138,9 +138,6 @@
             <argument name="isIncludesAvailable" xsi:type="boolean">false</argument>
         </arguments>
     </type>
-    <type name="Magento\Backend\Model\Menu\Builder">
-        <plugin name="SetupMenuBuilder" type="Magento\Backend\Model\Setup\MenuBuilder" />
-    </type>
     <type name="Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction">
         <arguments>
             <argument name="configs" xsi:type="array">

app/code/Magento/Backend/Test/Mftf/Page/AdminSetupWizardPage.xml

@@ -27,6 +27,5 @@
         <add id="Magento_Backend::stores_attributes" title="Attributes" translate="title" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::stores" resource="Magento_Backend::stores_attributes"/>
         <add id="Magento_Backend::other_settings" title="Other Settings" translate="title" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::stores" resource="Magento_Backend::stores_other_settings"/>
         <add id="Magento_Backend::system_other_settings" title="Other Settings" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system" resource="Magento_Backend::system_other_settings"/>
-        <add id="Magento_Backend::setup_wizard" action="adminhtml/backendapp/redirect/app/setup" title="Web Setup Wizard" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system_tools" resource="Magento_Backend::setup_wizard"/>
     </menu>
 </config>

app/code/Magento/Backend/Test/Mftf/Test/AdminRedirectToAdminPanelOnLogoClickFromWizardPageTest.xml

@@ -153,20 +153,6 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\Setup\BackendApp" type="Magento\Backend\App\BackendApp">
-        <arguments>
-            <argument name="cookiePath" xsi:type="string">setup</argument>
-            <argument name="startupPage" xsi:type="string">setup</argument>
-            <argument name="aclResourceName" xsi:type="string">Magento_Backend::setup_wizard</argument>
-        </arguments>
-    </virtualType>
-    <type name="Magento\Backend\App\BackendAppList">
-        <arguments>
-            <argument name="backendApps" xsi:type="array">
-                <item name="setup" xsi:type="object">Magento\Setup\BackendApp</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\App\Response\HeaderManager">
         <arguments>
             <argument name="headerProviderList" xsi:type="array">

app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php

@@ -312,7 +312,6 @@ Attributes,Attributes
 "Connect Manager","Connect Manager"
 "Package Extensions","Package Extensions"
 Tools,Tools
-"Web Setup Wizard","Web Setup Wizard"
 Currency,Currency
 Communications,Communications
 Services,Services