Test stabilization

Author: okolesnyk

app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml

@@ -23,10 +23,12 @@
         <before>
             <magentoCLI command="config:set {{AdminCaptchaLength3ConfigData.path}} {{AdminCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
             <magentoCLI command="config:set {{AdminCaptchaSymbols1ConfigData.path}} {{AdminCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
         </before>
         <after>
             <magentoCLI command="config:set {{AdminCaptchaDefaultLengthConfigData.path}} {{AdminCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
             <magentoCLI command="config:set {{AdminCaptchaDefaultSymbolsConfigData.path}} {{AdminCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
         </after>
 
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdminWithWrongCredentialsFirstAttempt">

app/code/Magento/Customer/Test/Mftf/Test/StorefrontForgotPasswordTest.xml

@@ -20,10 +20,11 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
-            <magentoCLI command="config:set customer/captcha/enable 0" stepKey="disableCaptcha"/>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDisableConfigData.path}} {{StorefrontCustomerCaptchaDisableConfigData.value}}" stepKey="disableCaptcha"/>
             <createData stepKey="customer" entity="Simple_US_Customer"/>
         </before>
         <after>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaEnableConfigData.path}} {{StorefrontCustomerCaptchaEnableConfigData.value}}" stepKey="enableCaptcha"/>
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>