Backport work to 10.4.x

Alex Pottrequested to merge
issue/drupal-3421202:3421202-concurrent-w3c-and-non-w3c-testing-10.4.x into 10.4.x

Closes #3421202

Merge request reports