Merge branch 'stabilize-builds' into MFTF-green

Author: engcom-Foxtrot

app/code/Magento/LoginAsCustomer/composer.json

@@ -5,8 +5,7 @@
         "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
-        "magento/module-login-as-customer-api": "*",
-        "magento/module-store": "*"
+        "magento/module-login-as-customer-api": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/LoginAsCustomerLog/composer.json

@@ -4,13 +4,7 @@
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
-        "magento/module-login-as-customer-api": "*",
-        "magento/module-backend": "*",
-        "magento/module-customer": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*",
-        "magento/module-user": "*"
+        "magento/module-backend": "*"
     },
     "suggest": {
         "magento/module-login-as-customer": "*"

app/code/Magento/LoginAsCustomerSales/composer.json

@@ -8,7 +8,6 @@
         "magento/module-checkout": "*",
         "magento/module-customer": "*",
         "magento/module-quote": "*",
-        "magento/module-login-as-customer": "*",
         "magento/module-user": "*"
     },
     "suggest": {

app/code/Magento/LoginAsCustomerUi/composer.json

@@ -8,8 +8,7 @@
         "magento/module-backend": "*",
         "magento/module-customer": "*",
         "magento/module-store": "*",
-        "magento/module-ui": "*",
-        "magento/module-user": "*"
+        "magento/module-ui": "*"
     },
     "suggest": {
         "magento/module-login-as-customer": "*"

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

@@ -18,7 +18,7 @@
                     <label>Enable Extension</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="enable_store_view_manual_choice" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="store_view_manual_choice_enabled" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Store View To Login In</label>
                     <source_model>Magento\LoginAsCustomerUi\Model\Config\Source\StoreViewLogin</source_model>
                     <comment><![CDATA[