Merge branch 'ACP2E-2765' of https://github.com/adobe-commerce-tier-4/magento2ce into 2.4-develop

Author: thiaramus

app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

@@ -379,6 +379,7 @@
         <data key="company">Magento</data>
         <array key="street">
             <item>6161 West Centinela Avenue</item>
+            <item>16</item>
         </array>
         <data key="city">Culver City</data>
         <data key="country_id">US</data>

app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml

@@ -32,10 +32,10 @@
             <magentoCLI command="config:set {{AdminFedexEnableSandboxModeConfigData.path}} {{AdminFedexEnableSandboxModeConfigData.value}}" stepKey="enableSandbox"/>
             <magentoCLI command="config:set {{AdminFedexEnableDebugConfigData.path}} {{AdminFedexEnableDebugConfigData.value}}" stepKey="enableDebug"/>
             <magentoCLI command="config:set {{AdminFedexEnableShowMethodConfigData.path}} {{AdminFedexEnableShowMethodConfigData.value}}" stepKey="enableShowMethod"/>
-            <magentoCLI command="config:set {{AdminFedexAccount.path}} {{_CREDS.carriers_fedex_account}}" stepKey="accountSetting"/>
-            <magentoCLI command="config:set {{AdminFedexHubId.path}} {{_CREDS.carriers_fedex_smartpost_hubid}}" stepKey="accountHub"/>
-            <magentoCLI command="config:set {{AdminFedexApiKey.path}} {{_CREDS.carriers_fedex_api_key}}" stepKey="accountApiKey"/>
-            <magentoCLI command="config:set {{AdminFedexSecretKey.path}} {{_CREDS.carriers_fedex_secret_key}}" stepKey="accountSecretKey"/>
+            <magentoCLI command="config:set {{AdminFedexAccount.path}} {{_CREDS.magento/carriers_fedex_account}}" stepKey="accountSetting"/>
+            <magentoCLI command="config:set {{AdminFedexHubId.path}} {{_CREDS.magento/carriers_fedex_smartpost_hubid}}" stepKey="accountHub"/>
+            <magentoCLI command="config:set {{AdminFedexApiKey.path}} {{_CREDS.magento/carriers_fedex_api_key}}" stepKey="accountApiKey"/>
+            <magentoCLI command="config:set {{AdminFedexSecretKey.path}} {{_CREDS.magento/carriers_fedex_secret_key}}" stepKey="accountSecretKey"/>
 
             <!--Set StoreInformation configs data-->
             <magentoCLI command="config:set {{AdminGeneralSetStoreNameConfigData.path}} '{{AdminGeneralSetStoreNameConfigData.value}}'" stepKey="setStoreInformationName"/>
@@ -44,15 +44,15 @@
             <magentoCLI command="config:set {{AdminGeneralSetCityConfigData.path}} '{{US_Address_California.city}}'" stepKey="setStoreInformationCity"/>
             <magentoCLI command="config:set {{AdminGeneralSetPostcodeConfigData.path}} {{US_Address_California.postcode}}" stepKey="setStoreInformationPostcode"/>
             <magentoCLI command="config:set {{AdminGeneralSetStreetAddressConfigData.path}} '{{US_Address_California.street[0]}}'" stepKey="setStoreInformationStreetAddress"/>
-            <magentoCLI command="config:set {{AdminGeneralSetStreetAddress2ConfigData.path}} '{{US_Address_California.street[0]}}'" stepKey="setStoreInformationStreetAddress2"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStreetAddress2ConfigData.path}} '{{US_Address_California.street[1]}}'" stepKey="setStoreInformationStreetAddress2"/>
             <magentoCLI command="config:set {{AdminGeneralSetVatNumberConfigData.path}} {{AdminGeneralSetVatNumberConfigData.value}}" stepKey="setStoreInformationVatNumber"/>
 
             <!--Set Shipping settings origin data-->
             <magentoCLI command="config:set {{AdminShippingSettingsOriginCountryConfigData.path}} {{US_Address_AE.country_id}}" stepKey="setOriginCountry"/>
             <magentoCLI command="config:set {{AdminShippingSettingsOriginCityConfigData.path}} '{{US_Address_AE.city}}'" stepKey="setOriginCity"/>
             <magentoCLI command="config:set {{AdminShippingSettingsOriginZipCodeConfigData.path}} {{US_Address_AE.postcode}}" stepKey="setOriginZipCode"/>
             <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddressConfigData.path}} '{{US_Address_AE.street[0]}}'" stepKey="setOriginStreetAddress"/>
-            <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddress2ConfigData.path}} '{{US_Address_AE.street[0]}}'" stepKey="setOriginStreetAddress2"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddress2ConfigData.path}} '{{US_Address_AE.street[1]}}'" stepKey="setOriginStreetAddress2"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
             </actionGroup>