Upstream Merge Conflict (2.4-develop)

[mage-os-ci]

This PR was automatically generated: a human is required.

Auto-merging app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php
Auto-merging app/code/Magento/Backend/view/adminhtml/layout/default.xml
Auto-merging app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/NotAvailableMessageResolver.php
CONFLICT (content): Merge conflict in app/code/Magento/CatalogInventoryGraphQl/Model/Resolver/NotAvailableMessageResolver.php
Auto-merging app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php
Auto-merging app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
Auto-merging app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php
Auto-merging app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort.php
Auto-merging app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/SortTest.php
CONFLICT (content): Merge conflict in app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/SortTest.php
Auto-merging app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
Auto-merging app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
Auto-merging app/code/Magento/Integration/Test/Unit/Model/Config/XsdTest.php
Auto-merging app/code/Magento/QuoteGraphQl/etc/schema.graphqls
Auto-merging app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/XsdTest.php
Auto-merging app/code/Magento/SalesRule/Model/Quote/Discount.php
Auto-merging app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/ByFixedTest.php
Auto-merging app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
Auto-merging composer.json
Auto-merging composer.lock
CONFLICT (content): Merge conflict in composer.lock
Auto-merging dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
Auto-merging dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/StockAvailabilityTest.php
CONFLICT (content): Merge conflict in dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/StockAvailabilityTest.php
Auto-merging dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/DateOfFirstOrderResolverTest.php
CONFLICT (add/add): Merge conflict in dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/DateOfFirstOrderResolverTest.php
Auto-merging dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
Auto-merging dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php
CONFLICT (content): Merge conflict in dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php
Auto-merging dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json
Auto-merging dev/tests/integration/testsuite/Magento/Security/Model/ResourceModel/UserExpirationTest.php
Auto-merging lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
Auto-merging lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
Automatic merge failed; fix conflicts and then commit the result.

[fballiano]

@rhoerr how could we try to review this PR, it has a gazillion commits (but only 77 modified files) 😅

if @Vinai think it's ok then I guess we should merge what we have to merge and go from there ;-)

[rhoerr]

@fballiano So far we've mostly blanket accepted changes from upstream. They auto-sync except in these cases of a merge conflict. We need to give a close eye to any merge conflicts, but otherwise upstream work has been vetted (and isn't guaranteed complete/stable anyway). Check my work, then merge and we'll move on.

Note this isn't a direct blocker for the upcoming distribution release, because that's all from branch release/1.x.

Thanks

[fballiano]

as discussed in the meeting, let's merge