Merge remote-tracking branch 'mainline/2.3-develop' into MQE-1496

Author: tomreece

dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt

@@ -216,5 +216,5 @@ Magento/Elasticsearch6/Model/Client
 Magento/Config/App/Config/Type
 Magento/InventoryReservationCli/Test/Integration
 Magento/InventoryAdminUi/Controller/Adminhtml
-Magento/Newsletter/Model/Queue/TransportBuilder
-Magento/Framework/Mail/Template/TransportBuilder
+Magento/Newsletter/Model/Queue
+Magento/Framework/Mail/Template

dev/tools/UpgradeScripts/pre_composer_update_2.3.php

@@ -234,14 +234,15 @@
     output('\nUpdating "require-dev" section of composer.json');
     runComposer('require --dev ' .
         'allure-framework/allure-phpunit:~1.2.0 ' .
-        'friendsofphp/php-cs-fixer:~2.13.0 ' .
+        'friendsofphp/php-cs-fixer:~2.14.0 ' .
         'lusitanian/oauth:~0.8.10 ' .
-        'magento/magento-coding-standard:~1.0.0 ' .
-        'magento/magento2-functional-testing-framework:~2.3.14 ' .
+        'magento/magento-coding-standard:~3.0.0 ' .
+        'magento/magento2-functional-testing-framework:~2.4.3 ' .
         'pdepend/pdepend:2.5.2 ' .
+        'phpmd/phpmd:@stable ' .
         'phpunit/phpunit:~6.5.0 ' .
         'sebastian/phpcpd:~3.0.0 ' .
-        'squizlabs/php_codesniffer:3.3.1 ' .
+        'squizlabs/php_codesniffer:3.4.0 ' .
         '--sort-packages --no-update');
     output('');
     runComposer('remove --dev sjparkinson/static-review fabpot/php-cs-fixer --no-update');