Merge remote-tracking branch 'origin/MC-33710' into MC-33394-pr-delivery

Author: danielrenaud

app/code/Magento/CatalogSearch/etc/adminhtml/system.xml

@@ -35,7 +35,7 @@
                     <comment>Number of popular search terms to be cached for faster response. Use “0” to cache all results after a term is searched for the second time.</comment>
                     <validate>validate-digits</validate>
                 </field>
-                <field id="autocomplete_limit" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="autocomplete_limit" translate="label" type="text" sortOrder="19" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Autocomplete Limit</label>
                     <validate>validate-digits</validate>
                 </field>

app/code/Magento/Elasticsearch7/etc/adminhtml/system.xml

@@ -11,31 +11,31 @@
         <section id="catalog">
             <group id="search">
                 <!-- Elasticsearch 7.0+ -->
-                <field id="elasticsearch7_server_hostname" translate="label" type="text" sortOrder="81"
+                <field id="elasticsearch7_server_hostname" translate="label" type="text" sortOrder="61"
                        showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Elasticsearch Server Hostname</label>
                     <depends>
                         <field id="engine">elasticsearch7</field>
                     </depends>
                 </field>
 
-                <field id="elasticsearch7_server_port" translate="label" type="text" sortOrder="82" showInDefault="1"
+                <field id="elasticsearch7_server_port" translate="label" type="text" sortOrder="62" showInDefault="1"
                        showInWebsite="0" showInStore="0">
                     <label>Elasticsearch Server Port</label>
                     <depends>
                         <field id="engine">elasticsearch7</field>
                     </depends>
                 </field>
 
-                <field id="elasticsearch7_index_prefix" translate="label" type="text" sortOrder="83" showInDefault="1"
+                <field id="elasticsearch7_index_prefix" translate="label" type="text" sortOrder="63" showInDefault="1"
                        showInWebsite="0" showInStore="0">
                     <label>Elasticsearch Index Prefix</label>
                     <depends>
                         <field id="engine">elasticsearch7</field>
                     </depends>
                 </field>
 
-                <field id="elasticsearch7_enable_auth" translate="label" type="select" sortOrder="84" showInDefault="1"
+                <field id="elasticsearch7_enable_auth" translate="label" type="select" sortOrder="64" showInDefault="1"
                        showInWebsite="0" showInStore="0">
                     <label>Enable Elasticsearch HTTP Auth</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -44,7 +44,7 @@
                     </depends>
                 </field>
 
-                <field id="elasticsearch7_username" translate="label" type="text" sortOrder="85" showInDefault="1"
+                <field id="elasticsearch7_username" translate="label" type="text" sortOrder="65" showInDefault="1"
                        showInWebsite="0" showInStore="0">
                     <label>Elasticsearch HTTP Username</label>
                     <depends>
@@ -53,7 +53,7 @@
                     </depends>
                 </field>
 
-                <field id="elasticsearch7_password" translate="label" type="text" sortOrder="86" showInDefault="1"
+                <field id="elasticsearch7_password" translate="label" type="text" sortOrder="66" showInDefault="1"
                        showInWebsite="0" showInStore="0">
                     <label>Elasticsearch HTTP Password</label>
                     <depends>
@@ -62,15 +62,15 @@
                     </depends>
                 </field>
 
-                <field id="elasticsearch7_server_timeout" translate="label" type="text" sortOrder="87" showInDefault="1"
+                <field id="elasticsearch7_server_timeout" translate="label" type="text" sortOrder="67" showInDefault="1"
                        showInWebsite="0" showInStore="0">
                     <label>Elasticsearch Server Timeout</label>
                     <depends>
                         <field id="engine">elasticsearch7</field>
                     </depends>
                 </field>
 
-                <field id="elasticsearch7_test_connect_wizard" translate="button_label" sortOrder="88" showInDefault="1"
+                <field id="elasticsearch7_test_connect_wizard" translate="button_label" sortOrder="68" showInDefault="1"
                        showInWebsite="0" showInStore="0">
                     <label/>
                     <button_label>Test Connection</button_label>
@@ -79,7 +79,7 @@
                         <field id="engine">elasticsearch7</field>
                     </depends>
                 </field>
-                <field id="elasticsearch7_minimum_should_match" translate="label" type="text" sortOrder="89" showInDefault="1">
+                <field id="elasticsearch7_minimum_should_match" translate="label" type="text" sortOrder="93" showInDefault="1">
                     <label>Minimum Terms to Match</label>
                     <depends>
                         <field id="engine">elasticsearch7</field>

app/code/Magento/Search/etc/adminhtml/system.xml

@@ -9,7 +9,7 @@
     <system>
         <section id="catalog">
             <group id="search">
-                <field id="engine" translate="label" type="select" sortOrder="19" showInDefault="1">
+                <field id="engine" translate="label" type="select" sortOrder="20" showInDefault="1">
                     <label>Search Engine</label>
                     <source_model>Magento\Search\Model\Adminhtml\System\Config\Source\Engine</source_model>
                 </field>