Merge remote-tracking branch 'mainline/2.2-develop' into MC-18487

Author: Rrego6

composer.json

@@ -76,7 +76,7 @@
     },
     "require-dev": {
         "allure-framework/allure-phpunit": "~1.2.0",
-        "magento/magento2-functional-testing-framework": "2.5.0",
+        "magento/magento2-functional-testing-framework": "2.5.1",
         "phpunit/phpunit": "~6.2.0",
         "squizlabs/php_codesniffer": "3.2.2",
         "phpmd/phpmd": "@stable",