reverted:
--- b/core/modules/migrate/config/schema/migrate.data_types.schema.yml
+++ a/core/modules/migrate/config/schema/migrate.data_types.schema.yml
@@ -14,10 +14,6 @@
 migrate_source:
   type: migrate_plugin
   label: 'Source'
-  mapping:
-    constants:
-      type: ignore
-      label: 'Constants'
 
 # Base schema for migrate source plugins that extend
 # \Drupal\migrate\Plugin\migrate\source\SqlBase.
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_action_settings.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-id: d7_action_settings
-label: Drupal 7 action configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - actions_max_stack
-process:
-  recursion_limit: actions_max_stack
-destination:
-  plugin: config
-  config_name: action.settings
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_file_settings.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-id: d7_file_settings
-label: Drupal 7 file configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - file_description_type
-    - file_description_length
-    - file_icon_directory
-process:
-  'description/type': file_description_type
-  'description/length': file_description_length
-  'icon/directory': file_icon_directory
-destination:
-  plugin: config
-  config_name: file.settings
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_authorize.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-id: d7_system_authorize
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - authorize_filetransfer_default
-process:
-   filetransfer_default: authorize_filetransfer_default
-destination:
-  plugin: config
-  config_name: system.authorize
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_cron.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-id: d7_system_cron
-label: Drupal 7 cron settings
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - cron_threshold_warning
-    - cron_threshold_error
-process:
-  'threshold/requirements_warning': cron_threshold_warning
-  'threshold/requirements_error': cron_threshold_error
-destination:
-  plugin: config
-  config_name: system.cron
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_date.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-id: d7_system_date
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - site_default_country
-    - date_first_day
-    - date_default_timezone
-    - configurable_timezones
-    - empty_timezone_message
-    - user_default_timezone
-process:
-  'country/default': site_default_country
-  first_day: date_first_day
-  'timezone/default': date_default_timezone
-  'timezone/user/configurable': configurable_timezones
-  'timezone/user/warn': empty_timezone_message
-  'timezone/user/default': user_default_timezone
-destination:
-  plugin: config
-  config_name: system.date
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_file.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-id: d7_system_file
-label: Drupal 7 file system configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - allow_insecure_uploads
-    - file_temporary_path
-process:
-  allow_insecure_uploads:
-    plugin: static_map
-    source: allow_insecure_uploads
-    map:
-      0: FALSE
-      1: TRUE
-  'path/temporary': file_temporary_path
-destination:
-  plugin: config
-  config_name: system.file
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_filter.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-id: d7_system_filter
-label: Drupal 7 system filter configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - filter_allowed_protocols
-process:
-  protocols: filter_allowed_protocols
-destination:
-  plugin: config
-  config_name: system.filter
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_image.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-id: d7_system_image
-label: Drupal 7 image toolkit configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - image_toolkit
-process:
-  toolkit: image_toolkit
-destination:
-  plugin: config
-  config_name: system.image
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_image_gd.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-id: d7_system_image_gd
-label: Drupal 7 image quality configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - image_jpeg_quality
-process:
-  jpeg_quality: image_jpeg_quality
-destination:
-  plugin: config
-  config_name: system.image.gd
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_logging.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-id: d7_system_logging
-label: Drupal 7 system logging
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - error_level
-process:
-  error_level:
-    plugin: static_map
-    source: error_level
-    default_value: all
-    map:
-      0: hide
-      1: some
-      2: all
-      3: verbose
-destination:
-  plugin: config
-  config_name: system.logging
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_mail.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-id: d7_system_mail
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - mail_system
-process:
-  'interface/default':
-    plugin: static_map
-    source: 'mail_system/default-system'
-    map:
-      DefaultMailSystem: php_mail
-      MailTestCase: test_mail_collector
-destination:
-  plugin: config
-  config_name: system.mail
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_maintenance.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-id: d7_system_maintenance
-label: Drupal 7 maintainence page configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - site_offline_message
-process:
-  message: site_offline_message
-destination:
-  plugin: config
-  config_name: system.maintenance
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_performance.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-id: d7_system_performance
-label: Drupal 7 performance configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - preprocess_css
-    - preprocess_js
-    - cache_lifetime
-    - page_compression
-process:
-  'css/preprocess': preprocess_css
-  'js/preprocess': preprocess_js
-  'cache/page/max_age': cache_lifetime
-  'response/gzip': page_compression
-destination:
-  plugin: config
-  config_name: system.performance
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_rss.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-id: d7_system_rss
-label: Drupal 7 RSS configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - feed_default_items
-    - feed_item_length
-process:
-  'items/limit': feed_default_items
-  'items/view_mode': feed_item_length
-destination:
-  plugin: config
-  config_name: system.rss
reverted:
--- b/core/modules/migrate_drupal/config/optional/migrate.migration.d7_system_site.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-id: d7_system_site
-label: Drupal 7 site configuration
-migration_tags:
-  - Drupal 7
-source:
-  plugin: variable
-  variables:
-    - site_name
-    - site_mail
-    - site_slogan
-    - site_frontpage
-    - site_403
-    - site_404
-    - drupal_weight_select_max
-    - admin_compact_mode
-process:
-  name: site_name
-  mail: site_mail
-  slogan: site_slogan
-  'page/front': site_frontpage
-  'page/403': site_403
-  'page/404': site_404
-  weight_select_max: drupal_weight_select_max
-  admin_compact_mode: admin_compact_mode
-destination:
-  plugin: config
-  config_name: system.site
reverted:
--- b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
+++ a/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
@@ -43,30 +43,18 @@
       'value',
     ))
     ->values(array(
-      'name' => 'actions_max_stack',
-      'value' => 'i:28;',
-    ))->values(array(
       'name' => 'additional_settings__active_tab_test_content_type',
       'value' => 's:15:"edit-submission";',
     ))->values(array(
-      'name' => 'admin_compact_mode',
-      'value' => 'b:1;',
-    ))->values(array(
       'name' => 'admin_theme',
       'value' => 's:5:"seven";',
     ))->values(array(
       'name' => 'allow_insecure_derivatives',
       'value' => 'b:1;',
     ))->values(array(
-      'name' => 'allow_insecure_uploads',
-      'value' => 'i:1;',
-    ))->values(array(
       'name' => 'anonymous',
       'value' => 's:9:"Anonymous";',
     ))->values(array(
-      'name' => 'authorize_filetransfer_default',
-      'value' => 's:3:"ftp";',
-    ))->values(array(
       'name' => 'block_cache',
       'value' => 'i:0;',
     ))->values(array(
@@ -76,9 +64,6 @@
       'name' => 'book_child_type',
       'value' => 's:4:"book";',
     ))->values(array(
-      'name' => 'cache',
-      'value' => 'i:0;',
-    ))->values(array(
       'name' => 'cache_lifetime',
       'value' => 's:3:"300";',
     ))->values(array(
@@ -109,9 +94,6 @@
       'name' => 'comment_test_content_type',
       'value' => 's:1:"2";',
     ))->values(array(
-      'name' => 'configurable_timezones',
-      'value' => 'b:1;',
-    ))->values(array(
       'name' => 'contact_default_status',
       'value' => 'i:1;',
     ))->values(array(
@@ -119,13 +101,7 @@
       'value' => 's:43:"_vWFj-dRR2rNoHDwl7N__J9uZNutDcLz3w4tlPJzRAM";',
     ))->values(array(
       'name' => 'cron_last',
+      'value' => 'i:1432653550;',
-      'value' => 'i:1432750697;',
-    ))->values(array(
-      'name' => 'cron_threshold_error',
-      'value' => 'i:1209600;',
-    ))->values(array(
-      'name' => 'cron_threshold_warning',
-      'value' => 'i:172800;',
     ))->values(array(
       'name' => 'css_js_query_string',
       'value' => 's:6:"nihmmw";',
@@ -142,9 +118,6 @@
       'name' => 'date_default_timezone',
       'value' => 's:15:"America/Chicago";',
     ))->values(array(
-      'name' => 'date_first_day',
-      'value' => 'i:1;',
-    ))->values(array(
       'name' => 'default_nodes_main',
       'value' => 's:2:"10";',
     ))->values(array(
@@ -154,24 +127,9 @@
       'name' => 'drupal_private_key',
       'value' => 's:43:"9eRJWxrMwQ5CufYJjXBZbPGz_t8vPIYRQr18PamdKmM";',
     ))->values(array(
-      'name' => 'drupal_weight_select_max',
-      'value' => 'i:40;',
-    ))->values(array(
       'name' => 'email__active_tab',
       'value' => 's:25:"edit-email-password-reset";',
     ))->values(array(
-      'name' => 'empty_timezone_message',
-      'value' => 'b:1;',
-    ))->values(array(
-      'name' => 'error_level',
-      'value' => 'i:1;',
-    ))->values(array(
-      'name' => 'feed_default_items',
-      'value' => 'i:27;',
-    ))->values(array(
-      'name' => 'feed_item_length',
-      'value' => 's:8:"fulltext";',
-    ))->values(array(
       'name' => 'field_bundle_settings_comment__comment_node_test_content_type',
       'value' => 'a:2:{s:10:"view_modes";a:0:{}s:12:"extra_fields";a:2:{s:4:"form";a:2:{s:6:"author";a:1:{s:6:"weight";s:2:"-2";}s:7:"subject";a:1:{s:6:"weight";s:2:"-1";}}s:7:"display";a:0:{}}}',
     ))->values(array(
@@ -181,24 +139,9 @@
       'name' => 'field_bundle_settings_user__user',
       'value' => 'a:2:{s:10:"view_modes";a:0:{}s:12:"extra_fields";a:2:{s:4:"form";a:2:{s:7:"account";a:1:{s:6:"weight";s:3:"-10";}s:8:"timezone";a:1:{s:6:"weight";s:1:"6";}}s:7:"display";a:0:{}}}',
     ))->values(array(
-      'name' => 'file_description_length',
-      'value' => 'i:256;',
-    ))->values(array(
-      'name' => 'file_description_type',
-      'value' => 's:9:"textfield";',
-    ))->values(array(
-      'name' => 'file_directory_path',
-      'value' => 's:19:"sites/default/files";',
-    ))->values(array(
-      'name' => 'file_icon_directory',
-      'value' => 's:25:"sites/default/files/icons";',
-    ))->values(array(
       'name' => 'file_temporary_path',
       'value' => 's:4:"/tmp";',
     ))->values(array(
-      'name' => 'filter_allowed_protocols',
-      'value' => 'a:3:{i:0;s:4:"http";i:1;s:5:"https";i:2;s:3:"irc";}',
-    ))->values(array(
       'name' => 'filter_fallback_format',
       'value' => 's:10:"plain_text";',
     ))->values(array(
@@ -208,12 +151,6 @@
       'name' => 'forum_nav_vocabulary',
       'value' => 's:1:"2";',
     ))->values(array(
-      'name' => 'image_jpeg_quality',
-      'value' => 'i:80;',
-    ))->values(array(
-      'name' => 'image_toolkit',
-      'value' => 's:2:"gd";',
-    ))->values(array(
       'name' => 'install_profile',
       'value' => 's:8:"standard";',
     ))->values(array(
@@ -238,9 +175,6 @@
       'name' => 'language_types',
       'value' => 'a:3:{s:8:"language";b:1;s:16:"language_content";b:0;s:12:"language_url";b:0;}',
     ))->values(array(
-      'name' => 'mail_system',
-      'value' => 'a:1:{s:14:"default-system";s:17:"DefaultMailSystem";}',
-    ))->values(array(
       'name' => 'maintenance_mode',
       'value' => 'i:0;',
     ))->values(array(
@@ -352,9 +286,6 @@
       'name' => 'site_name',
       'value' => 's:13:"The Site Name";',
     ))->values(array(
-      'name' => 'site_offline_message',
-      'value' => 's:42:"This is a custom maintenance mode message.";',
-    ))->values(array(
       'name' => 'site_slogan',
       'value' => 's:10:"The Slogan";',
     ))->values(array(
@@ -373,12 +304,6 @@
       'name' => 'suppress_itok_output',
       'value' => 'b:1;',
     ))->values(array(
-      'name' => 'taxonomy_override_selector',
-      'value' => 'b:1;',
-    ))->values(array(
-      'name' => 'taxonomy_terms_per_page_admin',
-      'value' => 'i:84;',
-    ))->values(array(
       'name' => 'theme_default',
       'value' => 's:6:"bartik";',
     ))->values(array(
@@ -388,9 +313,6 @@
       'name' => 'user_cancel_method',
       'value' => 's:17:"user_cancel_block";',
     ))->values(array(
-      'name' => 'user_default_timezone',
-      'value' => 'i:2;',
-    ))->values(array(
       'name' => 'user_email_verification',
       'value' => 'i:1;',
     ))->values(array(
@@ -496,4 +418,4 @@
   }
 
 }
+#d17f3e6a80f5f51c105acf809f1b4851
-#a7dc52cc0485f63013b31359cb163dde
reverted:
--- b/core/modules/migrate_drupal/src/Tests/d7/MigrateSystemConfigurationTest.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d7\MigrateSystemConfigurationTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d7;
-
-use Drupal\migrate\MigrateExecutable;
-
-/**
- * Migrates various configuration objects owned by the System module.
- *
- * @group migrate_drupal 7.x
- * @dumpFile d7/Variable.php
- * @migration d7_action_settings
- * @migration d7_file_settings
- * @migration d7_system_authorize
- * @migration d7_system_cron
- * @migration d7_system_date
- * @migration d7_system_file
- * @migration d7_system_filter
- * @migration d7_system_image_gd
- * @migration d7_system_image
- * @migration d7_system_logging
- * @migration d7_system_mail
- * @migration d7_system_performance
- * @migration d7_system_rss
- * @migration d7_system_site
- */
-class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase {
-
-  static $modules = array('action', 'file', 'system');
-
-  protected $expectedConfig = [
-    'action.settings' => [
-      'recursion_limit' => 28,
-    ],
-    'file.settings' => [
-      'description' => [
-        'type' => 'textfield',
-        'length' => 256,
-      ],
-      'icon' => [
-        'directory' => 'sites/default/files/icons',
-      ],
-    ],
-    'system.authorize' => [
-      'filetransfer_default' => 'ftp',
-    ],
-    'system.cron' => [
-      'threshold' => [
-        // autorun is not handled by the migration.
-        'autorun' => 0,
-        'requirements_warning' => 172800,
-        'requirements_error' => 1209600,
-      ],
-    ],
-    'system.date' => [
-      'country' => [
-        'default' => 'US',
-      ],
-      'first_day' => 1,
-      'timezone' => [
-        'default' => 'America/Chicago',
-        'user' => [
-          'configurable' => TRUE,
-          'warn' => TRUE,
-          // DRUPAL_USER_TIMEZONE_SELECT (D7 API)
-          'default' => 2,
-        ],
-      ],
-    ],
-    'system.file' => [
-      'allow_insecure_uploads' => TRUE,
-      // default_scheme is not handled by the migration.
-      'default_scheme' => 'public',
-      'path' => [
-        'temporary' => '/tmp',
-      ],
-      // temporary_maximum_age is not handled by the migration.
-      'temporary_maximum_age' => 21600,
-    ],
-    'system.filter' => [
-      'protocols' => ['http', 'https', 'irc'],
-    ],
-    'system.image.gd' => [
-      'jpeg_quality' => 80,
-    ],
-    'system.image' => [
-      'toolkit' => 'gd',
-    ],
-    'system.logging' => [
-      'error_level' => 'some',
-    ],
-    'system.mail' => [
-      'interface' => [
-        'default' => 'php_mail',
-      ],
-    ],
-    'system.maintenance' => [
-      'message' => 'This is a custom maintenance mode message.',
-      // langcode is not handled by the migration.
-      'langcode' => 'en',
-    ],
-    'system.performance' => [
-      'cache' => [
-        'page' => [
-          'max_age' => 300,
-        ],
-      ],
-      'css' => [
-        'preprocess' => TRUE,
-        // gzip is not handled by the migration.
-        'gzip' => TRUE,
-      ],
-      // fast_404 is not handled by the migration.
-      'fast_404' => [
-        'enabled' => TRUE,
-        'paths' => '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i',
-        'exclude_paths' => '/\/(?:styles|imagecache)\//',
-        'html' => '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>',
-      ],
-      'js' => [
-        'preprocess' => FALSE,
-        // gzip is not handled by the migration.
-        'gzip' => TRUE,
-      ],
-      // stale_file_threshold is not handled by the migration.
-      'stale_file_threshold' => 2592000,
-      'response' => [
-        'gzip' => TRUE,
-      ],
-    ],
-    'system.rss' => [
-      'channel' => [
-        'description' => '',
-      ],
-      'items' => [
-        'limit' => 27,
-        'view_mode' => 'fulltext',
-      ],
-      'langcode' => 'en',
-    ],
-    'system.site' => [
-      // uuid is not handled by the migration.
-      'uuid' => '',
-      'name' => 'The Site Name',
-      'mail' => 'joseph@flattandsons.com',
-      'slogan' => 'The Slogan',
-      'page' => [
-        '403' => 'node',
-        '404' => 'node',
-        'front' => 'node',
-      ],
-      'admin_compact_mode' => TRUE,
-      'weight_select_max' => 40,
-      // langcode and default_langcode are not handled by the migration.
-      'langcode' => 'en',
-      'default_langcode' => 'en',
-    ],
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->loadDumps([
-      $this->getDumpDirectory() . '/Variable.php',
-    ]);
-
-    $migration = entity_load('migration', 'd7_action_settings');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_file_settings');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_authorize');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_cron');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_date');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_file');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_filter');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_image_gd');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_image');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_logging');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_mail');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_maintenance');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_performance');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_rss');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd7_system_site');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-  }
-
-  /**
-   * Tests that all expected configuration gets migrated.
-   */
-  public function testConfigurationMigration() {
-    foreach ($this->expectedConfig as $config_id => $values) {
-      $this->assertIdentical(\Drupal::config($config_id)->get(), $values, $config_id . ' matches expected values.');
-    }
-  }
-
-}
reverted:
--- b/core/scripts/migrate-db.sh
+++ a/core/scripts/migrate-db.sh
@@ -388,7 +388,7 @@
     // Volatile state variables should always be ignored. We don't want to
     // exclude all cache_* variables, since that would exclude cache_lifetime,
     // which is configuration, not state.
+    'variable' => "SELECT * FROM {variable} WHERE name NOT LIKE 'cache_flush_%' AND name NOT IN ('cache', 'drupal_css_cache_files', 'javascript_parsed', 'statistics_day_timestamp', 'update_last_check')",
-    'variable' => "SELECT * FROM {variable} WHERE name NOT LIKE 'cache_flush_%' AND name NOT IN ('drupal_css_cache_files', 'javascript_parsed', 'statistics_day_timestamp', 'update_last_check')",
   );
   return isset($queries[$table]) ? $queries[$table] : 'SELECT * FROM {' . $table .'}';
 }
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -40867,6 +40867,10 @@
   'value',
 ))
 ->values(array(
+  'name' => 'actions_max_stack',
+  'value' => 'i:28;',
+))
+->values(array(
   'name' => 'additional_settings__active_tab_article',
   'value' => 's:15:"edit-submission";',
 ))
@@ -40891,6 +40895,10 @@
   'value' => 's:13:"edit-workflow";',
 ))
 ->values(array(
+  'name' => 'admin_compact_mode',
+  'value' => 'b:1;',
+))
+->values(array(
   'name' => 'admin_theme',
   'value' => 's:5:"seven";',
 ))
@@ -40927,10 +40935,18 @@
   'value' => 'b:1;',
 ))
 ->values(array(
+  'name' => 'allow_insecure_uploads',
+  'value' => 'i:1;',
+))
+->values(array(
   'name' => 'anonymous',
   'value' => 's:9:"Anonymous";',
 ))
 ->values(array(
+  'name' => 'authorize_filetransfer_default',
+  'value' => 's:3:"ftp";',
+))
+->values(array(
   'name' => 'block_cache',
   'value' => 'i:0;',
 ))
@@ -40943,6 +40959,10 @@
   'value' => 's:4:"book";',
 ))
 ->values(array(
+  'name' => 'cache',
+  'value' => 'i:0;',
+))
+->values(array(
   'name' => 'cache_flush_cache',
   'value' => 'i:0;',
 ))
@@ -41155,6 +41175,10 @@
   'value' => 's:1:"2";',
 ))
 ->values(array(
+  'name' => 'configurable_timezones',
+  'value' => 'b:1;',
+))
+->values(array(
   'name' => 'contact_default_status',
   'value' => 'i:1;',
 ))
@@ -41175,6 +41199,14 @@
   'value' => 'i:1444944970;',
 ))
 ->values(array(
+  'name' => 'cron_threshold_error',
+  'value' => 'i:1209600;',
+))
+->values(array(
+  'name' => 'cron_threshold_warning',
+  'value' => 'i:172800;',
+))
+->values(array(
   'name' => 'css_js_query_string',
   'value' => 's:6:"nwa6nq";',
 ))
@@ -41195,6 +41227,10 @@
   'value' => 's:15:"America/Chicago";',
 ))
 ->values(array(
+  'name' => 'date_first_day',
+  'value' => 'i:1;',
+))
+->values(array(
   'name' => 'dblog_row_limit',
   'value' => 'i:10000;',
 ))
@@ -41215,10 +41251,30 @@
   'value' => 's:43:"9eRJWxrMwQ5CufYJjXBZbPGz_t8vPIYRQr18PamdKmM";',
 ))
 ->values(array(
+  'name' => 'drupal_weight_select_max',
+  'value' => 'i:40;',
+))
+->values(array(
   'name' => 'email__active_tab',
   'value' => 's:27:"edit-email-pending-approval";',
 ))
 ->values(array(
+  'name' => 'empty_timezone_message',
+  'value' => 'b:1;',
+))
+->values(array(
+  'name' => 'error_level',
+  'value' => 'i:1;',
+))
+->values(array(
+  'name' => 'feed_default_items',
+  'value' => 'i:27;',
+))
+->values(array(
+  'name' => 'feed_item_length',
+  'value' => 's:8:"fulltext";',
+))
+->values(array(
   'name' => 'field_bundle_settings_comment__comment_node_test_content_type',
   'value' => 'a:2:{s:10:"view_modes";a:0:{}s:12:"extra_fields";a:2:{s:4:"form";a:2:{s:6:"author";a:1:{s:6:"weight";s:2:"-2";}s:7:"subject";a:1:{s:6:"weight";s:2:"-1";}}s:7:"display";a:0:{}}}',
 ))
@@ -41235,6 +41291,22 @@
   'value' => 's:6:"public";',
 ))
 ->values(array(
+  'name' => 'file_description_length',
+  'value' => 'i:256;',
+))
+->values(array(
+  'name' => 'file_description_type',
+  'value' => 's:9:"textfield";',
+))
+->values(array(
+  'name' => 'file_directory_path',
+  'value' => 's:19:"sites/default/files";',
+))
+->values(array(
+  'name' => 'file_icon_directory',
+  'value' => 's:25:"sites/default/files/icons";',
+))
+->values(array(
   'name' => 'file_private_path',
   'value' => 's:0:"";',
 ))
@@ -41247,6 +41319,10 @@
   'value' => 's:4:"/tmp";',
 ))
 ->values(array(
+  'name' => 'filter_allowed_protocols',
+  'value' => 'a:3:{i:0;s:4:"http";i:1;s:5:"https";i:2;s:3:"irc";}',
+))
+->values(array(
   'name' => 'filter_fallback_format',
   'value' => 's:10:"plain_text";',
 ))
@@ -41279,10 +41355,18 @@
   'value' => 'i:25;',
 ))
 ->values(array(
+  'name' => 'image_jpeg_quality',
+  'value' => 'i:80;',
+))
+->values(array(
   'name' => 'image_style_preview_image',
   'value' => 's:33:"core/modules/image/testsample.png";',
 ))
 ->values(array(
+  'name' => 'image_toolkit',
+  'value' => 's:2:"gd";',
+))
+->values(array(
   'name' => 'install_profile',
   'value' => 's:8:"standard";',
 ))
@@ -41355,6 +41439,10 @@
   'value' => 's:6:"domain";',
 ))
 ->values(array(
+  'name' => 'mail_system',
+  'value' => 'a:1:{s:14:"default-system";s:17:"DefaultMailSystem";}',
+))
+->values(array(
   'name' => 'maintenance_mode',
   'value' => 'i:0;',
 ))
@@ -41619,6 +41707,10 @@
   'value' => 's:13:"The Site Name";',
 ))
 ->values(array(
+  'name' => 'site_offline_message',
+  'value' => 's:42:"This is a custom maintenance mode message.";',
+))
+->values(array(
   'name' => 'site_slogan',
   'value' => 's:10:"The Slogan";',
 ))
@@ -41659,6 +41751,14 @@
   'value' => 's:6:"drupal";',
 ))
 ->values(array(
+  'name' => 'taxonomy_override_selector',
+  'value' => 'b:1;',
+))
+->values(array(
+  'name' => 'taxonomy_terms_per_page_admin',
+  'value' => 'i:84;',
+))
+->values(array(
   'name' => 'teaser_length',
   'value' => 'i:1024;',
 ))
@@ -41703,6 +41803,10 @@
   'value' => 's:17:"user_cancel_block";',
 ))
 ->values(array(
+  'name' => 'user_default_timezone',
+  'value' => 'i:2;',
+))
+->values(array(
   'name' => 'user_email_verification',
   'value' => 'i:1;',
 ))