Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce into tinymce3

Author: sivaschenko

composer.json

@@ -71,7 +71,7 @@
         "php-amqplib/php-amqplib": "~2.10.0",
         "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/phpseclib": "2.0.*",
-        "ramsey/uuid": "~3.8.0",
+        "ramsey/uuid": "~4.1.0",
         "symfony/console": "~4.4.0",
         "symfony/event-dispatcher": "~4.4.0",
         "symfony/process": "~4.4.0",
@@ -82,7 +82,7 @@
         "web-token/jwt-framework": "^v2.2.7"
     },
     "require-dev": {
-        "allure-framework/allure-phpunit": "~1.3.1",
+        "allure-framework/allure-phpunit": "~1.4",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
         "friendsofphp/php-cs-fixer": "~2.18.1",
         "lusitanian/oauth": "~0.8.10",