ACP2E-2312: avoid possible error when running setup:upgrade

Author: alzota

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

@@ -12,16 +12,6 @@
     <preference for="Magento\Framework\App\Config\CommentParserInterface" type="Magento\Config\Model\Config\Parser\Comment" />
     <preference for="Magento\Config\Model\Config\Structure\ElementVisibilityInterface" type="Magento\Config\Model\Config\Structure\ElementVisibilityComposite" />
     <preference for="Magento\Config\Console\Command\LocaleEmulatorInterface" type="Magento\Config\Console\Command\LocaleEmulator" />
-    <type name="Magento\Config\Console\Command\ConfigSetCommand">
-        <arguments>
-            <argument name="localeEmulator" xsi:type="object">Magento\Config\Console\Command\LocaleEmulatorInterface\Proxy</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Config\Console\Command\ConfigShowCommand">
-        <arguments>
-            <argument name="localeEmulator" xsi:type="object">Magento\Config\Console\Command\LocaleEmulatorInterface\Proxy</argument>
-        </arguments>
-    </type>
     <type name="Magento\Config\Model\Config\Structure\ElementVisibilityComposite">
         <arguments>
             <argument name="visibility" xsi:type="array">
@@ -320,6 +310,12 @@
     <type name="Magento\Config\Console\Command\ConfigShowCommand">
         <arguments>
             <argument name="configSource" xsi:type="object">configShowSourceAggregated</argument>
+            <argument name="localeEmulator" xsi:type="object">Magento\Config\Console\Command\LocaleEmulatorInterface\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Config\Console\Command\ConfigSetCommand">
+        <arguments>
+            <argument name="localeEmulator" xsi:type="object">Magento\Config\Console\Command\LocaleEmulatorInterface\Proxy</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\Console\CommandListInterface">