Issue #3447475 by larowlan: Fix fails in HEAD (aka whack a mole)

tests/src/Functional/migrate_drupal/d6/Upgrade6Test.php

@@ -62,7 +62,7 @@ class Upgrade6Test extends MigrateUpgradeExecuteTestBase {
         fn() => 27,
       ),
       'base_field_override' => 22,
-      'block' => 33,
+      'block' => 48,
       'block_content' => 1,
       'block_content_type' => 1,
       'comment' => 4,

tests/src/Functional/migrate_drupal/d7/Upgrade7Test.php

@@ -73,7 +73,7 @@ class Upgrade7Test extends MigrateUpgradeExecuteTestBase {
         fn() => 27,
       ),
       'base_field_override' => 3,
-      'block' => 26,
+      'block' => 41,
       'block_content' => 1,
       'block_content_type' => 1,
       'comment' => 0,