diff --git a/core/lib/Drupal/Core/Command/DbDumpCommand.php b/core/lib/Drupal/Core/Command/DbDumpCommand.php
index 26b4363cdd3cac504389aa5b315cfbb96c461367..a7d6d090502b3173452d712bcdea4a5136e63293 100644
--- a/core/lib/Drupal/Core/Command/DbDumpCommand.php
+++ b/core/lib/Drupal/Core/Command/DbDumpCommand.php
@@ -162,12 +162,19 @@ protected function getTableSchema(Connection $connection, $table) {
         $definition['fields'][$name]['precision'] = $matches[2];
         $definition['fields'][$name]['scale'] = $matches[3];
       }
-      elseif ($type === 'time' || $type === 'datetime') {
+      elseif ($type === 'time') {
         // @todo Core doesn't support these, but copied from `migrate-db.sh` for now.
         // Convert to varchar.
         $definition['fields'][$name]['type'] = 'varchar';
         $definition['fields'][$name]['length'] = '100';
       }
+      elseif ($type === 'datetime') {
+        // Adjust for other database types.
+        $definition['fields'][$name]['mysql_type'] = 'datetime';
+        $definition['fields'][$name]['pgsql_type'] = 'timestamp without time zone';
+        $definition['fields'][$name]['sqlite_type'] = 'varchar';
+        $definition['fields'][$name]['sqlsrv_type'] = 'smalldatetime';
+      }
       elseif (!isset($definition['fields'][$name]['size'])) {
         // Try use the provided length, if it doesn't exist default to 100. It's
         // not great but good enough for our dumps at this point.
diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
index 389a4df56b2082abf9a801ce184847a2c352ab6a..6c009573998e80b485aab33e7fbdcef91c55d48e 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal6.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
@@ -292,7 +292,6 @@
   'description' => 'Block current user',
 ))
 ->execute();
-
 $connection->schema()->createTable('actions_aid', array(
   'fields' => array(
     'aid' => array(
@@ -331,7 +330,6 @@
   'aid' => '6',
 ))
 ->execute();
-
 $connection->schema()->createTable('aggregator_category', array(
   'fields' => array(
     'cid' => array(
@@ -463,7 +461,6 @@
   'block' => '7',
 ))
 ->execute();
-
 $connection->schema()->createTable('aggregator_item', array(
   'fields' => array(
     'iid' => array(
@@ -539,7 +536,6 @@
   'guid' => '395218 at https://groups.drupal.org',
 ))
 ->execute();
-
 $connection->schema()->createTable('authmap', array(
   'fields' => array(
     'aid' => array(
@@ -617,7 +613,6 @@
   'batch' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('blocks', array(
   'fields' => array(
     'bid' => array(
@@ -1080,7 +1075,6 @@
   'cache' => '-1',
 ))
 ->execute();
-
 $connection->schema()->createTable('blocks_roles', array(
   'fields' => array(
     'module' => array(
@@ -1125,7 +1119,6 @@
   'rid' => '3',
 ))
 ->execute();
-
 $connection->schema()->createTable('book', array(
   'fields' => array(
     'mlid' => array(
@@ -1188,7 +1181,6 @@
   'bid' => '8',
 ))
 ->execute();
-
 $connection->schema()->createTable('boxes', array(
   'fields' => array(
     'bid' => array(
@@ -1241,7 +1233,6 @@
   'format' => '2',
 ))
 ->execute();
-
 $connection->schema()->createTable('cache', array(
   'fields' => array(
     'cid' => array(
@@ -2023,7 +2014,6 @@
   'homepage' => '',
 ))
 ->execute();
-
 $connection->schema()->createTable('config', array(
   'fields' => array(
     'collection' => array(
@@ -2063,7 +2053,6 @@
   'data' => 'a:1:{s:4:"path";a:1:{s:9:"temporary";s:4:"/tmp";}}',
 ))
 ->execute();
-
 $connection->schema()->createTable('contact', array(
   'fields' => array(
     'cid' => array(
@@ -2141,7 +2130,6 @@
   'selected' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('content_field_company', array(
   'fields' => array(
     'vid' => array(
@@ -2219,7 +2207,6 @@
   'field_company_nid' => '16',
 ))
 ->execute();
-
 $connection->schema()->createTable('content_field_image', array(
   'fields' => array(
     'vid' => array(
@@ -2288,7 +2275,6 @@
   'field_image_data' => 'a:2:{s:3:"alt";s:0:"";s:5:"title";s:0:"";}',
 ))
 ->execute();
-
 $connection->schema()->createTable('content_field_multivalue', array(
   'fields' => array(
     'vid' => array(
@@ -2351,7 +2337,6 @@
   'delta' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('content_field_test', array(
   'fields' => array(
     'vid' => array(
@@ -2429,7 +2414,6 @@
   'field_test_format' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('content_field_test_text_single_checkbox', array(
   'fields' => array(
     'vid' => array(
@@ -2495,7 +2479,6 @@
   'field_test_text_single_checkbox_value' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('content_field_test_two', array(
   'fields' => array(
     'vid' => array(
@@ -2581,7 +2564,6 @@
   'field_test_two_value' => '20',
 ))
 ->execute();
-
 $connection->schema()->createTable('content_group', array(
   'fields' => array(
     'group_type' => array(
@@ -3073,7 +3055,6 @@
   'locked' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('content_node_field_instance', array(
   'fields' => array(
     'field_name' => array(
@@ -3515,7 +3496,6 @@
   'widget_active' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('content_type_employee', array(
   'fields' => array(
     'vid' => array(
@@ -3601,7 +3581,6 @@
   'field_company_3_nid' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('content_type_page', array(
   'fields' => array(
     'vid' => array(
@@ -3687,7 +3666,6 @@
   'field_reference_2_nid' => '11',
 ))
 ->execute();
-
 $connection->schema()->createTable('content_type_story', array(
   'fields' => array(
     'nid' => array(
@@ -4057,7 +4035,6 @@
   'field_test_string_selectlist_value' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('content_type_test_page', array(
   'fields' => array(
     'vid' => array(
@@ -4148,7 +4125,6 @@
   'vid' => '11',
 ))
 ->execute();
-
 $connection->schema()->createTable('date_format_locale', array(
   'fields' => array(
     'format' => array(
@@ -4221,7 +4197,6 @@
   'locked' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('date_formats', array(
   'fields' => array(
     'dfid' => array(
@@ -4471,7 +4446,6 @@
   'locked' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('event', array(
   'fields' => array(
     'nid' => array(
@@ -8271,7 +8245,6 @@
   'is_dst' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('files', array(
   'fields' => array(
     'fid' => array(
@@ -8394,7 +8367,6 @@
   'timestamp' => '1420858106',
 ))
 ->execute();
-
 $connection->schema()->createTable('filter_formats', array(
   'fields' => array(
     'format' => array(
@@ -8459,7 +8431,6 @@
   'cache' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('filters', array(
   'fields' => array(
     'fid' => array(
@@ -8591,7 +8562,6 @@
   'weight' => '10',
 ))
 ->execute();
-
 $connection->schema()->createTable('flood', array(
   'fields' => array(
     'fid' => array(
@@ -8674,7 +8644,6 @@
   'tid' => '8',
 ))
 ->execute();
-
 $connection->schema()->createTable('history', array(
   'fields' => array(
     'uid' => array(
@@ -8770,7 +8739,6 @@
   'timestamp' => '1534014763',
 ))
 ->execute();
-
 $connection->schema()->createTable('i18n_blocks', array(
   'fields' => array(
     'ibid' => array(
@@ -8832,7 +8800,6 @@
   'language' => 'zu',
 ))
 ->execute();
-
 $connection->schema()->createTable('i18n_strings', array(
   'fields' => array(
     'lid' => array(
@@ -10096,7 +10063,6 @@
   'format' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('i18n_variable', array(
   'fields' => array(
     'name' => array(
@@ -10536,7 +10502,6 @@
   'value' => 's:1:"1";',
 ))
 ->execute();
-
 $connection->schema()->createTable('imagecache_action', array(
   'fields' => array(
     'actionid' => array(
@@ -10622,7 +10587,6 @@
   'data' => 'a:3:{s:7:"degrees";s:2:"55";s:6:"random";i:0;s:7:"bgcolor";s:0:"";}',
 ))
 ->execute();
-
 $connection->schema()->createTable('imagecache_preset', array(
   'fields' => array(
     'presetid' => array(
@@ -10657,7 +10621,6 @@
   'presetname' => 'big_blue_cheese',
 ))
 ->execute();
-
 $connection->schema()->createTable('languages', array(
   'fields' => array(
     'language' => array(
@@ -10793,7 +10756,6 @@
   'javascript' => '',
 ))
 ->execute();
-
 $connection->schema()->createTable('locales_source', array(
   'fields' => array(
     'lid' => array(
@@ -22688,7 +22650,6 @@
   'version' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('locales_target', array(
   'fields' => array(
     'lid' => array(
@@ -27748,24 +27709,24 @@
   'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '1678',
-  'translation' => 'fr - I really, really, really love migrating ',
+  'lid' => '1672',
+  'translation' => 'fr - Type',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
   'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '1690',
-  'translation' => 'Noir',
+  'lid' => '1678',
+  'translation' => 'fr - I really, really, really love migrating ',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
   'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '1672',
-  'translation' => 'fr - Type',
+  'lid' => '1690',
+  'translation' => 'Noir',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
@@ -27900,24 +27861,24 @@
   'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '1690',
-  'translation' => 'Okumnyama',
+  'lid' => '1672',
+  'translation' => 'zu - Type',
   'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
   'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '1691',
-  'translation' => 'Mhlophe',
+  'lid' => '1690',
+  'translation' => 'Okumnyama',
   'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
   'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '1672',
-  'translation' => 'zu - Type',
+  'lid' => '1691',
+  'translation' => 'Mhlophe',
   'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
@@ -27940,7 +27901,6 @@
   'i18n_status' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('menu_custom', array(
   'fields' => array(
     'menu_name' => array(
@@ -27989,7 +27949,6 @@
   'description' => 'Secondary links are often used for pages like legal notices, contact details, and other secondary navigation items that play a lesser role than primary links',
 ))
 ->execute();
-
 $connection->schema()->createTable('menu_links', array(
   'fields' => array(
     'menu_name' => array(
@@ -34478,7 +34437,6 @@
   'updated' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('menu_router', array(
   'fields' => array(
     'path' => array(
@@ -43690,7 +43648,6 @@
   'file' => '',
 ))
 ->execute();
-
 $connection->schema()->createTable('node', array(
   'fields' => array(
     'nid' => array(
@@ -44185,7 +44142,6 @@
   'translate' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('node_access', array(
   'fields' => array(
     'nid' => array(
@@ -44256,7 +44212,6 @@
   'grant_delete' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('node_comment_statistics', array(
   'fields' => array(
     'nid' => array(
@@ -44405,7 +44360,6 @@
   'comment_count' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('node_counter', array(
   'fields' => array(
     'nid' => array(
@@ -44552,7 +44506,6 @@
   'timestamp' => '1534014763',
 ))
 ->execute();
-
 $connection->schema()->createTable('node_revisions', array(
   'fields' => array(
     'nid' => array(
@@ -44902,7 +44855,6 @@
   'format' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('node_type', array(
   'fields' => array(
     'type' => array(
@@ -45202,7 +45154,6 @@
   'orig_type' => 'test_story',
 ))
 ->execute();
-
 $connection->schema()->createTable('permission', array(
   'fields' => array(
     'pid' => array(
@@ -45268,7 +45219,6 @@
   'tid' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('profile_fields', array(
   'fields' => array(
     'fid' => array(
@@ -45501,7 +45451,6 @@
   'options' => '',
 ))
 ->execute();
-
 $connection->schema()->createTable('profile_values', array(
   'fields' => array(
     'fid' => array(
@@ -45718,7 +45667,6 @@
   'value' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('role', array(
   'fields' => array(
     'rid' => array(
@@ -45766,7 +45714,6 @@
   'name' => 'migrate test role 3 that is longer than thirty two characters',
 ))
 ->execute();
-
 $connection->schema()->createTable('semaphore', array(
   'fields' => array(
     'name' => array(
@@ -47072,7 +47019,6 @@
   'info' => 'a:13:{s:4:"name";s:10:"Pushbutton";s:11:"description";s:52:"Tabled, multi-column theme in blue and orange tones.";s:7:"version";s:4:"6.38";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1456343372";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/pushbutton/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/pushbutton/script.js";}s:10:"screenshot";s:32:"themes/pushbutton/screenshot.png";s:3:"php";s:5:"4.3.5";}',
 ))
 ->execute();
-
 $connection->schema()->createTable('term_data', array(
   'fields' => array(
     'tid' => array(
@@ -47270,7 +47216,6 @@
   'trid' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('term_hierarchy', array(
   'fields' => array(
     'tid' => array(
@@ -47365,7 +47310,6 @@
   'parent' => '5',
 ))
 ->execute();
-
 $connection->schema()->createTable('term_node', array(
   'fields' => array(
     'nid' => array(
@@ -47439,7 +47383,6 @@
   'tid' => '8',
 ))
 ->execute();
-
 $connection->schema()->createTable('term_relation', array(
   'fields' => array(
     'trid' => array(
@@ -47603,7 +47546,6 @@
   'weight' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('url_alias', array(
   'fields' => array(
     'pid' => array(
@@ -47693,7 +47635,6 @@
   'language' => '',
 ))
 ->execute();
-
 $connection->schema()->createTable('users', array(
   'fields' => array(
     'uid' => array(
@@ -48015,7 +47956,6 @@
   'timezone_id' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('users_roles', array(
   'fields' => array(
     'uid' => array(
@@ -48082,7 +48022,6 @@
   'rid' => '5',
 ))
 ->execute();
-
 $connection->schema()->createTable('variable', array(
   'fields' => array(
     'name' => array(
@@ -49349,7 +49288,6 @@
   'value' => 's:1:"1";',
 ))
 ->execute();
-
 $connection->schema()->createTable('vocabulary', array(
   'fields' => array(
     'vid' => array(
@@ -49549,7 +49487,6 @@
   'language' => '',
 ))
 ->execute();
-
 $connection->schema()->createTable('vocabulary_node_types', array(
   'fields' => array(
     'vid' => array(
@@ -49607,7 +49544,6 @@
   'type' => 'story',
 ))
 ->execute();
-
 $connection->schema()->createTable('watchdog', array(
   'fields' => array(
     'wid' => array(
diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
index 9be6c119eb82c9b371cb230ed18bf67eeaf3a11d..68171683d8277dd6e6700ef3a85fddf33671a74c 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -371,7 +371,6 @@
   'timestamp' => '1444945246',
 ))
 ->execute();
-
 $connection->schema()->createTable('actions', array(
   'fields' => array(
     'aid' => array(
@@ -545,7 +544,6 @@
   'label' => 'Block current user',
 ))
 ->execute();
-
 $connection->schema()->createTable('aggregator_category', array(
   'fields' => array(
     'cid' => array(
@@ -735,7 +733,6 @@
   'block' => '5',
 ))
 ->execute();
-
 $connection->schema()->createTable('aggregator_item', array(
   'fields' => array(
     'iid' => array(
@@ -900,7 +897,6 @@
   'guid' => 'post:18829',
 ))
 ->execute();
-
 $connection->schema()->createTable('authmap', array(
   'fields' => array(
     'aid' => array(
@@ -1816,7 +1812,6 @@
   'i18n_mode' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('block_custom', array(
   'fields' => array(
     'bid' => array(
@@ -1862,7 +1857,6 @@
   'format' => 'filtered_html',
 ))
 ->execute();
-
 $connection->schema()->createTable('block_node_type', array(
   'fields' => array(
     'module' => array(
@@ -1928,7 +1922,6 @@
   'rid' => '2',
 ))
 ->execute();
-
 $connection->schema()->createTable('blocked_ips', array(
   'fields' => array(
     'iid' => array(
@@ -1960,7 +1953,6 @@
   'ip' => '111.111.111.111',
 ))
 ->execute();
-
 $connection->schema()->createTable('book', array(
   'fields' => array(
     'mlid' => array(
@@ -1992,33 +1984,32 @@
 ));
 
 $connection->insert('book')
-  ->fields(array(
-    'mlid',
-    'nid',
-    'bid',
-  ))
-  ->values(array(
-    'mlid' => '480',
-    'nid' => '4',
-    'bid' => '4',
-  ))
-  ->values(array(
-    'mlid' => '481',
-    'nid' => '6',
-    'bid' => '4',
-  ))
-  ->values(array(
-    'mlid' => '482',
-    'nid' => '2',
-    'bid' => '4',
-  ))
-  ->values(array(
-    'mlid' => '483',
-    'nid' => '1',
-    'bid' => '8',
-  ))
-  ->execute();
-
+->fields(array(
+  'mlid',
+  'nid',
+  'bid',
+))
+->values(array(
+  'mlid' => '480',
+  'nid' => '4',
+  'bid' => '4',
+))
+->values(array(
+  'mlid' => '481',
+  'nid' => '6',
+  'bid' => '4',
+))
+->values(array(
+  'mlid' => '482',
+  'nid' => '2',
+  'bid' => '4',
+))
+->values(array(
+  'mlid' => '483',
+  'nid' => '1',
+  'bid' => '8',
+))
+->execute();
 $connection->schema()->createTable('cache', array(
   'fields' => array(
     'cid' => array(
@@ -2711,7 +2702,6 @@
   'language' => 'is',
 ))
 ->execute();
-
 $connection->schema()->createTable('contact', array(
   'fields' => array(
     'cid' => array(
@@ -2773,7 +2763,6 @@
   'selected' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('ctools_css_cache', array(
   'fields' => array(
     'cid' => array(
@@ -2914,7 +2903,6 @@
   'locked' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('date_formats', array(
   'fields' => array(
     'dfid' => array(
@@ -3170,7 +3158,6 @@
   'locked' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('entity_translation', array(
   'fields' => array(
     'entity_type' => array(
@@ -3327,42 +3314,6 @@
   'created' => '1529615813',
   'changed' => '1529615813',
 ))
-->values(array(
-  'entity_type' => 'taxonomy_term',
-  'entity_id' => '4',
-  'revision_id' => '4',
-  'language' => 'en',
-  'source' => '',
-  'uid' => '1',
-  'status' => '1',
-  'translate' => '0',
-  'created' => '1531922259',
-  'changed' => '1531922259',
-))
-->values(array(
-  'entity_type' => 'taxonomy_term',
-  'entity_id' => '4',
-  'revision_id' => '4',
-  'language' => 'fr',
-  'source' => 'en',
-  'uid' => '2',
-  'status' => '1',
-  'translate' => '1',
-  'created' => '1531922267',
-  'changed' => '1531922268',
-))
-->values(array(
-  'entity_type' => 'taxonomy_term',
-  'entity_id' => '4',
-  'revision_id' => '4',
-  'language' => 'is',
-  'source' => 'en',
-  'uid' => '1',
-  'status' => '0',
-  'translate' => '0',
-  'created' => '1531922278',
-  'changed' => '1531922279',
-))
 ->values(array(
   'entity_type' => 'user',
   'entity_id' => '2',
@@ -3399,8 +3350,43 @@
   'created' => '1531663925',
   'changed' => '1531663925',
 ))
+->values(array(
+  'entity_type' => 'taxonomy_term',
+  'entity_id' => '4',
+  'revision_id' => '4',
+  'language' => 'en',
+  'source' => '',
+  'uid' => '1',
+  'status' => '1',
+  'translate' => '0',
+  'created' => '1531922259',
+  'changed' => '1531922259',
+))
+->values(array(
+  'entity_type' => 'taxonomy_term',
+  'entity_id' => '4',
+  'revision_id' => '4',
+  'language' => 'fr',
+  'source' => 'en',
+  'uid' => '2',
+  'status' => '1',
+  'translate' => '1',
+  'created' => '1531922267',
+  'changed' => '1531922268',
+))
+->values(array(
+  'entity_type' => 'taxonomy_term',
+  'entity_id' => '4',
+  'revision_id' => '4',
+  'language' => 'is',
+  'source' => 'en',
+  'uid' => '1',
+  'status' => '0',
+  'translate' => '0',
+  'created' => '1531922278',
+  'changed' => '1531922279',
+))
 ->execute();
-
 $connection->schema()->createTable('entity_translation_revision', array(
   'fields' => array(
     'entity_type' => array(
@@ -4206,7 +4192,6 @@
   'deleted' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_config_instance', array(
   'fields' => array(
     'id' => array(
@@ -4887,7 +4872,6 @@
   'deleted' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_body', array(
   'fields' => array(
     'entity_type' => array(
@@ -4996,7 +4980,6 @@
   'body_format' => 'filtered_html',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_comment_body', array(
   'fields' => array(
     'entity_type' => array(
@@ -5108,7 +5091,6 @@
   'comment_body_format' => 'filtered_html',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_description_field', array(
   'fields' => array(
     'entity_type' => array(
@@ -5196,7 +5178,10 @@
       'language',
     ),
     'description_field_format' => array(
-      'description_field_format',
+      array(
+        'description_field_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -5259,7 +5244,7 @@
   'revision_id' => '4',
   'language' => 'fr',
   'delta' => '0',
-  'description_field_value' => 'The third term en français s\'il vous plaît.',
+  'description_field_value' => "The third term en français s'il vous plaît.",
   'description_field_summary' => '',
   'description_field_format' => 'filtered_html',
 ))
@@ -5276,7 +5261,6 @@
   'description_field_format' => 'plain_text',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_boolean', array(
   'fields' => array(
     'entity_type' => array(
@@ -5359,7 +5343,6 @@
   'field_boolean_value' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_date', array(
   'fields' => array(
     'entity_type' => array(
@@ -5442,7 +5425,6 @@
   'field_date_value' => '2015-01-20 04:15:00',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_date_with_end_time', array(
   'fields' => array(
     'entity_type' => array(
@@ -5532,8 +5514,7 @@
   'field_date_with_end_time_value2' => '1421727300',
 ))
 ->execute();
-
-$connection->schema()->createTable('field_data_field_datetime_without_time', array(
+$connection->schema()->createTable('field_data_field_date_without_time', array(
   'fields' => array(
     'entity_type' => array(
       'type' => 'varchar',
@@ -5577,12 +5558,10 @@
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
-    'field_datetime_without_time_value' => array(
-      'mysql_type' => 'datetime',
-      'pgsql_type' => 'timestamp without time zone',
-      'sqlite_type' => 'varchar',
-      'sqlsrv_type' => 'smalldatetime',
+    'field_date_without_time_value' => array(
+      'type' => 'varchar',
       'not null' => FALSE,
+      'length' => '100',
     ),
   ),
   'primary key' => array(
@@ -5595,7 +5574,7 @@
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('field_data_field_datetime_without_time')
+$connection->insert('field_data_field_date_without_time')
 ->fields(array(
   'entity_type',
   'bundle',
@@ -5604,7 +5583,7 @@
   'revision_id',
   'language',
   'delta',
-  'field_datetime_without_time_value',
+  'field_date_without_time_value',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -5614,11 +5593,10 @@
   'revision_id' => '1',
   'language' => 'und',
   'delta' => '0',
-  'field_datetime_without_time_value' => '2015-01-20 00:00:00',
+  'field_date_without_time_value' => '2015-01-20T00:00:00',
 ))
 ->execute();
-
-$connection->schema()->createTable('field_data_field_date_without_time', array(
+$connection->schema()->createTable('field_data_field_datetime_without_time', array(
   'fields' => array(
     'entity_type' => array(
       'type' => 'varchar',
@@ -5662,10 +5640,13 @@
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
-    'field_date_without_time_value' => array(
-      'type' => 'varchar',
+    'field_datetime_without_time_value' => array(
+      'type' => 'datetime',
       'not null' => FALSE,
-      'length' => '100',
+      'mysql_type' => 'datetime',
+      'pgsql_type' => 'timestamp without time zone',
+      'sqlite_type' => 'varchar',
+      'sqlsrv_type' => 'smalldatetime',
     ),
   ),
   'primary key' => array(
@@ -5678,7 +5659,7 @@
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('field_data_field_date_without_time')
+$connection->insert('field_data_field_datetime_without_time')
 ->fields(array(
   'entity_type',
   'bundle',
@@ -5687,7 +5668,7 @@
   'revision_id',
   'language',
   'delta',
-  'field_date_without_time_value',
+  'field_datetime_without_time_value',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -5697,10 +5678,9 @@
   'revision_id' => '1',
   'language' => 'und',
   'delta' => '0',
-  'field_date_without_time_value' => '2015-01-20T00:00:00',
+  'field_datetime_without_time_value' => '2015-01-20 00:00:00',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_email', array(
   'fields' => array(
     'entity_type' => array(
@@ -5793,7 +5773,6 @@
   'field_email_email' => 'another@example.com',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_file', array(
   'fields' => array(
     'entity_type' => array(
@@ -5905,7 +5884,6 @@
   'field_file_description' => 'file desc',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_float', array(
   'fields' => array(
     'entity_type' => array(
@@ -5989,7 +5967,6 @@
   'field_float_value' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_float_list', array(
   'fields' => array(
     'entity_type' => array(
@@ -6095,7 +6072,6 @@
   'field_float_list_value' => '3.1416',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_image', array(
   'fields' => array(
     'entity_type' => array(
@@ -6292,7 +6268,6 @@
   'field_images_height' => '93',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_integer', array(
   'fields' => array(
     'entity_type' => array(
@@ -6485,7 +6460,6 @@
   'field_integer_value' => '4',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_integer_list', array(
   'fields' => array(
     'entity_type' => array(
@@ -6568,7 +6542,6 @@
   'field_integer_list_value' => '7',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_link', array(
   'fields' => array(
     'entity_type' => array(
@@ -6689,7 +6662,6 @@
   'field_link_attributes' => 'a:1:{s:5:"title";s:0:"";}',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_long_text', array(
   'fields' => array(
     'entity_type' => array(
@@ -6866,7 +6838,6 @@
   'field_node_entityreference_target_id' => '2',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_phone', array(
   'fields' => array(
     'entity_type' => array(
@@ -6949,7 +6920,6 @@
   'field_phone_value' => '99-99-99-99',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_private_file', array(
   'fields' => array(
     'entity_type' => array(
@@ -7072,7 +7042,6 @@
   'field_private_file_description' => '',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_reference', array(
   'fields' => array(
     'entity_type' => array(
@@ -7209,7 +7178,6 @@
   'field_reference_target_id' => '2',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_reference_2', array(
   'fields' => array(
     'entity_type' => array(
@@ -7346,7 +7314,6 @@
   'field_reference_2_target_id' => '2',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_tags', array(
   'fields' => array(
     'entity_type' => array(
@@ -7433,11 +7400,11 @@
   'entity_type' => 'node',
   'bundle' => 'article',
   'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '2',
+  'entity_id' => '3',
+  'revision_id' => '3',
   'language' => 'und',
-  'delta' => '1',
-  'field_tags_tid' => '14',
+  'delta' => '0',
+  'field_tags_tid' => '9',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -7446,8 +7413,8 @@
   'entity_id' => '2',
   'revision_id' => '2',
   'language' => 'und',
-  'delta' => '2',
-  'field_tags_tid' => '17',
+  'delta' => '1',
+  'field_tags_tid' => '14',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -7456,18 +7423,18 @@
   'entity_id' => '3',
   'revision_id' => '3',
   'language' => 'und',
-  'delta' => '0',
-  'field_tags_tid' => '9',
+  'delta' => '1',
+  'field_tags_tid' => '14',
 ))
 ->values(array(
   'entity_type' => 'node',
   'bundle' => 'article',
   'deleted' => '0',
-  'entity_id' => '3',
-  'revision_id' => '3',
+  'entity_id' => '2',
+  'revision_id' => '2',
   'language' => 'und',
-  'delta' => '1',
-  'field_tags_tid' => '14',
+  'delta' => '2',
+  'field_tags_tid' => '17',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -7480,7 +7447,6 @@
   'field_tags_tid' => '17',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_term_entityreference', array(
   'fields' => array(
     'entity_type' => array(
@@ -7597,7 +7563,6 @@
   'field_term_entityreference_target_id' => '15',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_term_reference', array(
   'fields' => array(
     'entity_type' => array(
@@ -7691,7 +7656,6 @@
   'field_term_reference_tid' => '3',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_text', array(
   'fields' => array(
     'entity_type' => array(
@@ -7781,7 +7745,6 @@
   'field_text_format' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_text_filtered', array(
   'fields' => array(
     'entity_type' => array(
@@ -7864,7 +7827,10 @@
       'language',
     ),
     'field_text_filtered_format' => array(
-      'field_text_filtered_format',
+      array(
+        'field_text_filtered_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -7952,7 +7918,6 @@
   'field_text_list_value' => 'Some more text',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_text_long_filtered', array(
   'fields' => array(
     'entity_type' => array(
@@ -8035,7 +8000,10 @@
       'language',
     ),
     'field_text_long_filtered_format' => array(
-      'field_text_long_filtered_format',
+      array(
+        'field_text_long_filtered_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -8123,7 +8091,10 @@
       'language',
     ),
     'field_text_long_plain_format' => array(
-      'field_text_long_plain_format',
+      array(
+        'field_text_long_plain_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -8211,7 +8182,10 @@
       'language',
     ),
     'field_text_long_plain_filtered_format' => array(
-      'field_text_long_plain_filtered_format',
+      array(
+        'field_text_long_plain_filtered_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -8299,7 +8273,10 @@
       'language',
     ),
     'field_text_plain_format' => array(
-      'field_text_plain_format',
+      array(
+        'field_text_plain_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -8387,7 +8364,10 @@
       'language',
     ),
     'field_text_plain_filtered_format' => array(
-      'field_text_plain_filtered_format',
+      array(
+        'field_text_plain_filtered_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -8480,7 +8460,10 @@
       'language',
     ),
     'field_text_sum_filtered_format' => array(
-      'field_text_sum_filtered_format',
+      array(
+        'field_text_sum_filtered_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -8573,7 +8556,10 @@
       'language',
     ),
     'field_text_sum_plain_format' => array(
-      'field_text_sum_plain_format',
+      array(
+        'field_text_sum_plain_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -8666,7 +8652,10 @@
       'language',
     ),
     'field_text_sum_plain_filtered_format' => array(
-      'field_text_sum_plain_filtered_format',
+      array(
+        'field_text_sum_plain_filtered_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -8778,7 +8767,6 @@
   'field_user_entityreference_target_id' => '2',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_name_field', array(
   'fields' => array(
     'entity_type' => array(
@@ -8861,7 +8849,10 @@
       'language',
     ),
     'name_field_format' => array(
-      'name_field_format',
+      array(
+        'name_field_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -8920,7 +8911,7 @@
   'revision_id' => '4',
   'language' => 'fr',
   'delta' => '0',
-  'name_field_value' => 'Term3 en français s\'il vous plaît',
+  'name_field_value' => "Term3 en français s'il vous plaît",
   'name_field_format' => NULL,
 ))
 ->values(array(
@@ -8935,7 +8926,6 @@
   'name_field_format' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_subject_field', array(
   'fields' => array(
     'entity_type' => array(
@@ -9018,7 +9008,10 @@
       'language',
     ),
     'subject_field_format' => array(
-      'subject_field_format',
+      array(
+        'subject_field_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -9092,7 +9085,6 @@
   'subject_field_format' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_taxonomy_forums', array(
   'fields' => array(
     'entity_type' => array(
@@ -9186,7 +9178,6 @@
   'taxonomy_forums_tid' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_title_field', array(
   'fields' => array(
     'entity_type' => array(
@@ -9269,7 +9260,10 @@
       'language',
     ),
     'title_field_format' => array(
-      'title_field_format',
+      array(
+        'title_field_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -9321,7 +9315,6 @@
   'title_field_format' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_body', array(
   'fields' => array(
     'entity_type' => array(
@@ -9455,7 +9448,6 @@
   'body_format' => 'filtered_html',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_comment_body', array(
   'fields' => array(
     'entity_type' => array(
@@ -9568,7 +9560,6 @@
   'comment_body_format' => 'filtered_html',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_description_field', array(
   'fields' => array(
     'entity_type' => array(
@@ -9657,7 +9648,10 @@
       'language',
     ),
     'description_field_format' => array(
-      'description_field_format',
+      array(
+        'description_field_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -9720,7 +9714,7 @@
   'revision_id' => '4',
   'language' => 'fr',
   'delta' => '0',
-  'description_field_value' => 'The third term en français s\'il vous plaît.',
+  'description_field_value' => "The third term en français s'il vous plaît.",
   'description_field_summary' => '',
   'description_field_format' => 'full_html',
 ))
@@ -9737,7 +9731,6 @@
   'description_field_format' => 'full_html',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_boolean', array(
   'fields' => array(
     'entity_type' => array(
@@ -9821,7 +9814,6 @@
   'field_boolean_value' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_date', array(
   'fields' => array(
     'entity_type' => array(
@@ -9905,7 +9897,6 @@
   'field_date_value' => '2015-01-20 04:15:00',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_date_with_end_time', array(
   'fields' => array(
     'entity_type' => array(
@@ -9996,8 +9987,7 @@
   'field_date_with_end_time_value2' => '1421727300',
 ))
 ->execute();
-
-$connection->schema()->createTable('field_revision_field_datetime_without_time', array(
+$connection->schema()->createTable('field_revision_field_date_without_time', array(
   'fields' => array(
     'entity_type' => array(
       'type' => 'varchar',
@@ -10041,12 +10031,10 @@
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
-    'field_datetime_without_time_value' => array(
-      'mysql_type' => 'datetime',
-      'pgsql_type' => 'timestamp without time zone',
-      'sqlite_type' => 'varchar',
-      'sqlsrv_type' => 'smalldatetime',
+    'field_date_without_time_value' => array(
+      'type' => 'varchar',
       'not null' => FALSE,
+      'length' => '100',
     ),
   ),
   'primary key' => array(
@@ -10060,7 +10048,7 @@
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('field_revision_field_datetime_without_time')
+$connection->insert('field_revision_field_date_without_time')
 ->fields(array(
   'entity_type',
   'bundle',
@@ -10069,7 +10057,7 @@
   'revision_id',
   'language',
   'delta',
-  'field_datetime_without_time_value',
+  'field_date_without_time_value',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -10079,11 +10067,10 @@
   'revision_id' => '1',
   'language' => 'und',
   'delta' => '0',
-  'field_datetime_without_time_value' => '2015-01-20 00:00:00',
+  'field_date_without_time_value' => '2015-01-20T00:00:00',
 ))
 ->execute();
-
-$connection->schema()->createTable('field_revision_field_date_without_time', array(
+$connection->schema()->createTable('field_revision_field_datetime_without_time', array(
   'fields' => array(
     'entity_type' => array(
       'type' => 'varchar',
@@ -10127,10 +10114,13 @@
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
-    'field_date_without_time_value' => array(
-      'type' => 'varchar',
+    'field_datetime_without_time_value' => array(
+      'type' => 'datetime',
       'not null' => FALSE,
-      'length' => '100',
+      'mysql_type' => 'datetime',
+      'pgsql_type' => 'timestamp without time zone',
+      'sqlite_type' => 'varchar',
+      'sqlsrv_type' => 'smalldatetime',
     ),
   ),
   'primary key' => array(
@@ -10144,7 +10134,7 @@
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('field_revision_field_date_without_time')
+$connection->insert('field_revision_field_datetime_without_time')
 ->fields(array(
   'entity_type',
   'bundle',
@@ -10153,7 +10143,7 @@
   'revision_id',
   'language',
   'delta',
-  'field_date_without_time_value',
+  'field_datetime_without_time_value',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -10163,10 +10153,9 @@
   'revision_id' => '1',
   'language' => 'und',
   'delta' => '0',
-  'field_date_without_time_value' => '2015-01-20T00:00:00',
+  'field_datetime_without_time_value' => '2015-01-20 00:00:00',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_email', array(
   'fields' => array(
     'entity_type' => array(
@@ -10260,7 +10249,6 @@
   'field_email_email' => 'another@example.com',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_file', array(
   'fields' => array(
     'entity_type' => array(
@@ -10373,7 +10361,6 @@
   'field_file_description' => 'file desc',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_float', array(
   'fields' => array(
     'entity_type' => array(
@@ -10458,7 +10445,6 @@
   'field_float_value' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_float_list', array(
   'fields' => array(
     'entity_type' => array(
@@ -10565,7 +10551,6 @@
   'field_float_list_value' => '3.1416',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_image', array(
   'fields' => array(
     'entity_type' => array(
@@ -10764,7 +10749,6 @@
   'field_images_height' => '93',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_integer', array(
   'fields' => array(
     'entity_type' => array(
@@ -10938,7 +10922,6 @@
   'field_integer_value' => '4',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_integer_list', array(
   'fields' => array(
     'entity_type' => array(
@@ -11022,7 +11005,6 @@
   'field_integer_list_value' => '7',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_link', array(
   'fields' => array(
     'entity_type' => array(
@@ -11144,7 +11126,6 @@
   'field_link_attributes' => 'a:1:{s:5:"title";s:0:"";}',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_long_text', array(
   'fields' => array(
     'entity_type' => array(
@@ -11323,7 +11304,6 @@
   'field_node_entityreference_target_id' => '2',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_phone', array(
   'fields' => array(
     'entity_type' => array(
@@ -11417,7 +11397,6 @@
   'field_phone_value' => '99-99-99-99',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_private_file', array(
   'fields' => array(
     'entity_type' => array(
@@ -11541,7 +11520,6 @@
   'field_private_file_description' => '',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_reference', array(
   'fields' => array(
     'entity_type' => array(
@@ -11679,7 +11657,6 @@
   'field_reference_target_id' => '2',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_reference_2', array(
   'fields' => array(
     'entity_type' => array(
@@ -11817,7 +11794,6 @@
   'field_reference_2_target_id' => '2',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_tags', array(
   'fields' => array(
     'entity_type' => array(
@@ -11952,7 +11928,6 @@
   'field_tags_tid' => '17',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_term_entityreference', array(
   'fields' => array(
     'entity_type' => array(
@@ -12070,7 +12045,6 @@
   'field_term_entityreference_target_id' => '15',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_term_reference', array(
   'fields' => array(
     'entity_type' => array(
@@ -12165,7 +12139,6 @@
   'field_term_reference_tid' => '3',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_text', array(
   'fields' => array(
     'entity_type' => array(
@@ -12256,7 +12229,6 @@
   'field_text_format' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_text_filtered', array(
   'fields' => array(
     'entity_type' => array(
@@ -12340,7 +12312,10 @@
       'language',
     ),
     'field_text_filtered_format' => array(
-      'field_text_filtered_format',
+      array(
+        'field_text_filtered_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -12429,7 +12404,6 @@
   'field_text_list_value' => 'Some more text',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_text_long_filtered', array(
   'fields' => array(
     'entity_type' => array(
@@ -12513,7 +12487,10 @@
       'language',
     ),
     'field_text_long_filtered_format' => array(
-      'field_text_long_filtered_format',
+      array(
+        'field_text_long_filtered_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -12602,7 +12579,10 @@
       'language',
     ),
     'field_text_long_plain_format' => array(
-      'field_text_long_plain_format',
+      array(
+        'field_text_long_plain_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -12691,7 +12671,10 @@
       'language',
     ),
     'field_text_long_plain_filtered_format' => array(
-      'field_text_long_plain_filtered_format',
+      array(
+        'field_text_long_plain_filtered_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -12780,7 +12763,10 @@
       'language',
     ),
     'field_text_plain_format' => array(
-      'field_text_plain_format',
+      array(
+        'field_text_plain_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -12869,7 +12855,10 @@
       'language',
     ),
     'field_text_plain_filtered_format' => array(
-      'field_text_plain_filtered_format',
+      array(
+        'field_text_plain_filtered_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -12963,7 +12952,10 @@
       'language',
     ),
     'field_text_sum_filtered_format' => array(
-      'field_text_sum_filtered_format',
+      array(
+        'field_text_sum_filtered_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -13057,7 +13049,10 @@
       'language',
     ),
     'field_text_sum_plain_format' => array(
-      'field_text_sum_plain_format',
+      array(
+        'field_text_sum_plain_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -13151,7 +13146,10 @@
       'language',
     ),
     'field_text_sum_plain_filtered_format' => array(
-      'field_text_sum_plain_filtered_format',
+      array(
+        'field_text_sum_plain_filtered_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -13242,28 +13240,6 @@
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('field_revision_field_user_entityreference')
-->fields(array(
-  'entity_type',
-  'bundle',
-  'deleted',
-  'entity_id',
-  'revision_id',
-  'language',
-  'delta',
-  'field_user_entityreference_target_id',
-))
-->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'test_content_type',
-  'deleted' => '0',
-  'entity_id' => '1',
-  'revision_id' => '1',
-  'language' => 'und',
-  'delta' => '0',
-  'field_user_entityreference_target_id' => '2',
-));
-
 $connection->schema()->createTable('field_revision_name_field', array(
   'fields' => array(
     'entity_type' => array(
@@ -13347,7 +13323,10 @@
       'language',
     ),
     'name_field_format' => array(
-      'name_field_format',
+      array(
+        'name_field_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -13406,7 +13385,7 @@
   'revision_id' => '4',
   'language' => 'fr',
   'delta' => '0',
-  'name_field_value' => 'Term3 en français s\'il vous plaît',
+  'name_field_value' => "Term3 en français s'il vous plaît",
   'name_field_format' => NULL,
 ))
 ->values(array(
@@ -13421,7 +13400,6 @@
   'name_field_format' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_subject_field', array(
   'fields' => array(
     'entity_type' => array(
@@ -13505,7 +13483,10 @@
       'language',
     ),
     'subject_field_format' => array(
-      'subject_field_format',
+      array(
+        'subject_field_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -13579,7 +13560,6 @@
   'subject_field_format' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_taxonomy_forums', array(
   'fields' => array(
     'entity_type' => array(
@@ -13674,7 +13654,6 @@
   'taxonomy_forums_tid' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_title_field', array(
   'fields' => array(
     'entity_type' => array(
@@ -13758,7 +13737,10 @@
       'language',
     ),
     'title_field_format' => array(
-      'title_field_format',
+      array(
+        'title_field_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -13810,7 +13792,6 @@
   'title_field_format' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('file_managed', array(
   'fields' => array(
     'fid' => array(
@@ -13922,9 +13903,7 @@
   'status' => '1',
   'timestamp' => '1421747516',
 ))
-
 ->execute();
-
 $connection->schema()->createTable('file_usage', array(
   'fields' => array(
     'fid' => array(
@@ -14006,7 +13985,6 @@
   'count' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('filter', array(
   'fields' => array(
     'format' => array(
@@ -14269,7 +14247,6 @@
   'settings' => 'a:1:{s:17:"filter_url_length";i:72;}',
 ))
 ->execute();
-
 $connection->schema()->createTable('filter_format', array(
   'fields' => array(
     'format' => array(
@@ -14353,7 +14330,6 @@
   'weight' => '10',
 ))
 ->execute();
-
 $connection->schema()->createTable('flood', array(
   'fields' => array(
     'fid' => array(
@@ -14439,7 +14415,6 @@
   'tid' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('forum_index', array(
   'fields' => array(
     'nid' => array(
@@ -14521,7 +14496,6 @@
   'comment_count' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('history', array(
   'fields' => array(
     'uid' => array(
@@ -14839,7 +14813,6 @@
   'format' => '',
 ))
 ->execute();
-
 $connection->schema()->createTable('image_effects', array(
   'fields' => array(
     'ieid' => array(
@@ -14929,7 +14902,6 @@
   'data' => 'a:3:{s:5:"width";s:2:"50";s:6:"height";s:2:"50";s:6:"anchor";s:8:"left-top";}',
 ))
 ->execute();
-
 $connection->schema()->createTable('image_styles', array(
   'fields' => array(
     'isid' => array(
@@ -14978,7 +14950,6 @@
   'label' => 'Custom image style 3',
 ))
 ->execute();
-
 $connection->schema()->createTable('languages', array(
   'fields' => array(
     'language' => array(
@@ -15108,7 +15079,6 @@
   'javascript' => '',
 ))
 ->execute();
-
 $connection->schema()->createTable('locales_source', array(
   'fields' => array(
     'lid' => array(
@@ -15150,7 +15120,10 @@
   ),
   'indexes' => array(
     'textgroup_context' => array(
-      'textgroup',
+      array(
+        'textgroup',
+        '191',
+      ),
       array(
         'context',
         '50',
@@ -15778,7 +15751,6 @@
   'version' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('locales_target', array(
   'fields' => array(
     'lid' => array(
@@ -15850,24 +15822,23 @@
   'plural' => '0',
   'i18n_status' => '0',
 ))
-  ->values(array(
-  'lid' => '57',
-  'translation' => 'is - Mildly amusing limerick of the day',
-  'language' => 'is',
+->values(array(
+  'lid' => '76',
+  'translation' => 'fr - User login title',
+  'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
   'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '76',
-  'translation' => 'fr - User login title',
-  'language' => 'fr',
+  'lid' => '57',
+  'translation' => 'is - Mildly amusing limerick of the day',
+  'language' => 'is',
   'plid' => '0',
   'plural' => '0',
   'i18n_status' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('menu_custom', array(
   'fields' => array(
     'menu_name' => array(
@@ -15926,7 +15897,6 @@
   'description' => "The <em>User</em> menu contains links related to the user's account, as well as the 'Log out' link.",
 ))
 ->execute();
-
 $connection->schema()->createTable('menu_links', array(
   'fields' => array(
     'menu_name' => array(
@@ -26437,114 +26407,114 @@
   'p9' => '0',
   'updated' => '0',
 ))
-  ->values(array(
-    'menu_name' => 'book-toc-1',
-    'mlid' => '480',
-    'plid' => '0',
-    'link_path' => 'node/4',
-    'router_path' => 'node/%',
-    'link_title' => 'Test top book title',
-    'options' => 'a:0:{}',
-    'module' => 'book',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '1',
-    'expanded' => '0',
-    'weight' => '-10',
-    'depth' => '1',
-    'customized' => '0',
-    'p1' => '480',
-    'p2' => '0',
-    'p3' => '0',
-    'p4' => '0',
-    'p5' => '0',
-    'p6' => '0',
-    'p7' => '0',
-    'p8' => '0',
-    'p9' => '0',
-    'updated' => '0',
-  ))
-  ->values(array(
-    'menu_name' => 'book-toc-1',
-    'mlid' => '481',
-    'plid' => '480',
-    'link_path' => 'node/6',
-    'router_path' => 'node/%',
-    'link_title' => 'Test book title child 1',
-    'options' => 'a:0:{}',
-    'module' => 'book',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '1',
-    'expanded' => '0',
-    'weight' => '0',
-    'depth' => '2',
-    'customized' => '0',
-    'p1' => '480',
-    'p2' => '481',
-    'p3' => '0',
-    'p4' => '0',
-    'p5' => '0',
-    'p6' => '0',
-    'p7' => '0',
-    'p8' => '0',
-    'p9' => '0',
-    'updated' => '0',
-  ))
-  ->values(array(
-    'menu_name' => 'book-toc-1',
-    'mlid' => '482',
-    'plid' => '481',
-    'link_path' => 'node/2',
-    'router_path' => 'node/%',
-    'link_title' => 'Test book title child 1.1',
-    'options' => 'a:0:{}',
-    'module' => 'book',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '0',
-    'depth' => '3',
-    'customized' => '0',
-    'p1' => '480',
-    'p2' => '481',
-    'p3' => '482',
-    'p4' => '0',
-    'p5' => '0',
-    'p6' => '0',
-    'p7' => '0',
-    'p8' => '0',
-    'p9' => '0',
-    'updated' => '0',
-  ))
-  ->values(array(
-    'menu_name' => 'book-toc-2',
-    'mlid' => '483',
-    'plid' => '481',
-    'link_path' => 'node/1',
-    'router_path' => 'node/%',
-    'link_title' => 'Test book title 2',
-    'options' => 'a:0:{}',
-    'module' => 'book',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '0',
-    'depth' => '3',
-    'customized' => '0',
-    'p1' => '480',
-    'p2' => '481',
-    'p3' => '483',
-    'p4' => '0',
-    'p5' => '0',
-    'p6' => '0',
-    'p7' => '0',
-    'p8' => '0',
-    'p9' => '0',
-    'updated' => '0',
-  ))
+->values(array(
+  'menu_name' => 'book-toc-1',
+  'mlid' => '480',
+  'plid' => '0',
+  'link_path' => 'node/4',
+  'router_path' => 'node/%',
+  'link_title' => 'Test top book title',
+  'options' => 'a:0:{}',
+  'module' => 'book',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '-10',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '480',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'book-toc-1',
+  'mlid' => '481',
+  'plid' => '480',
+  'link_path' => 'node/6',
+  'router_path' => 'node/%',
+  'link_title' => 'Test book title child 1',
+  'options' => 'a:0:{}',
+  'module' => 'book',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '480',
+  'p2' => '481',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'book-toc-1',
+  'mlid' => '482',
+  'plid' => '481',
+  'link_path' => 'node/2',
+  'router_path' => 'node/%',
+  'link_title' => 'Test book title child 1.1',
+  'options' => 'a:0:{}',
+  'module' => 'book',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '480',
+  'p2' => '481',
+  'p3' => '482',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'book-toc-2',
+  'mlid' => '483',
+  'plid' => '481',
+  'link_path' => 'node/1',
+  'router_path' => 'node/%',
+  'link_title' => 'Test book title 2',
+  'options' => 'a:0:{}',
+  'module' => 'book',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '480',
+  'p2' => '481',
+  'p3' => '483',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
 ->values(array(
   'menu_name' => 'navigation',
   'mlid' => '484',
@@ -26681,7 +26651,6 @@
   'updated' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('menu_router', array(
   'fields' => array(
     'path' => array(
@@ -37275,7 +37244,6 @@
   'include_file' => 'modules/user/user.pages.inc',
 ))
 ->execute();
-
 $connection->schema()->createTable('node', array(
   'fields' => array(
     'nid' => array(
@@ -37500,7 +37468,6 @@
   'translate' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('node_access', array(
   'fields' => array(
     'nid' => array(
@@ -37571,7 +37538,6 @@
   'grant_delete' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('node_comment_statistics', array(
   'fields' => array(
     'nid' => array(
@@ -37676,7 +37642,6 @@
   'comment_count' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('node_counter', array(
   'fields' => array(
     'nid' => array(
@@ -37763,7 +37728,6 @@
   'timestamp' => '1504715438',
 ))
 ->execute();
-
 $connection->schema()->createTable('node_revision', array(
   'fields' => array(
     'nid' => array(
@@ -37931,7 +37895,6 @@
   'sticky' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('node_type', array(
   'fields' => array(
     'type' => array(
@@ -38121,7 +38084,6 @@
   'orig_type' => 'test_content_type',
 ))
 ->execute();
-
 $connection->schema()->createTable('queue', array(
   'fields' => array(
     'item_id' => array(
@@ -38217,7 +38179,6 @@
   'mapping' => 'a:9:{s:7:"rdftype";a:1:{i:0;s:13:"foaf:Document";}s:5:"title";a:1:{s:10:"predicates";a:1:{i:0;s:8:"dc:title";}}s:7:"created";a:3:{s:10:"predicates";a:2:{i:0;s:7:"dc:date";i:1;s:10:"dc:created";}s:8:"datatype";s:12:"xsd:dateTime";s:8:"callback";s:12:"date_iso8601";}s:7:"changed";a:3:{s:10:"predicates";a:1:{i:0;s:11:"dc:modified";}s:8:"datatype";s:12:"xsd:dateTime";s:8:"callback";s:12:"date_iso8601";}s:4:"body";a:1:{s:10:"predicates";a:1:{i:0;s:15:"content:encoded";}}s:3:"uid";a:2:{s:10:"predicates";a:1:{i:0;s:16:"sioc:has_creator";}s:4:"type";s:3:"rel";}s:4:"name";a:1:{s:10:"predicates";a:1:{i:0;s:9:"foaf:name";}}s:13:"comment_count";a:2:{s:10:"predicates";a:1:{i:0;s:16:"sioc:num_replies";}s:8:"datatype";s:11:"xsd:integer";}s:13:"last_activity";a:3:{s:10:"predicates";a:1:{i:0;s:23:"sioc:last_activity_date";}s:8:"datatype";s:12:"xsd:dateTime";s:8:"callback";s:12:"date_iso8601";}}',
 ))
 ->execute();
-
 $connection->schema()->createTable('registry', array(
   'fields' => array(
     'name' => array(
@@ -38937,6 +38898,13 @@
   'module' => 'phone',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'CSPhoneNumberTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/phone/tests/phone.cs.test',
+  'module' => 'phone',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'CtoolsContextKeywordsSubstitutionTestCase',
   'type' => 'class',
@@ -39042,14 +39010,6 @@
   'module' => 'ctools',
   'weight' => '0',
 ))
-->values(array(
-  'name' => 'CSPhoneNumberTestCase',
-  'type' => 'class',
-  'filename' => 'sites/all/modules/phone/tests/phone.cs.test',
-  'module' => 'phone',
-  'weight' => '0',
-))
-
 ->values(array(
   'name' => 'DashboardBlocksTestCase',
   'type' => 'class',
@@ -44595,7 +44555,6 @@
   'weight' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('registry_file', array(
   'fields' => array(
     'filename' => array(
@@ -45949,7 +45908,6 @@
   'hash' => 'a52e010d27cc2eb29804a3acd30f574adf11fad1f5860e431178b61cddbdbb69',
 ))
 ->execute();
-
 $connection->schema()->createTable('role', array(
   'fields' => array(
     'rid' => array(
@@ -45999,7 +45957,6 @@
   'weight' => '2',
 ))
 ->execute();
-
 $connection->schema()->createTable('role_permission', array(
   'fields' => array(
     'rid' => array(
@@ -46505,7 +46462,6 @@
   'module' => 'system',
 ))
 ->execute();
-
 $connection->schema()->createTable('search_dataset', array(
   'fields' => array(
     'sid' => array(
@@ -46560,7 +46516,6 @@
   'reindex' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('search_index', array(
   'fields' => array(
     'word' => array(
@@ -46886,7 +46841,6 @@
   'score' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('search_node_links', array(
   'fields' => array(
     'sid' => array(
@@ -47134,7 +47088,6 @@
   'count' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('semaphore', array(
   'fields' => array(
     'name' => array(
@@ -47185,7 +47138,6 @@
   'value' => '2',
 ))
 ->execute();
-
 $connection->schema()->createTable('sessions', array(
   'fields' => array(
     'uid' => array(
@@ -47271,7 +47223,6 @@
   'title' => 'Alternative shortcut set',
 ))
 ->execute();
-
 $connection->schema()->createTable('shortcut_set_users', array(
   'fields' => array(
     'uid' => array(
@@ -47304,7 +47255,6 @@
   'set_name' => 'shortcut-set-2',
 ))
 ->execute();
-
 $connection->schema()->createTable('simpletest', array(
   'fields' => array(
     'message_id' => array(
@@ -49443,7 +49393,6 @@
   'info' => "a:17:{s:4:\"name\";s:5:\"Stark\";s:11:\"description\";s:208:\"This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, see the <a href=\"http://drupal.org/theme-guide\">Theming Guide</a>.\";s:7:\"package\";s:4:\"Core\";s:7:\"version\";s:4:\"7.40\";s:4:\"core\";s:3:\"7.x\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:7:\"project\";s:6:\"drupal\";s:9:\"datestamp\";s:10:\"1444866674\";s:6:\"engine\";s:11:\"phptemplate\";s:7:\"regions\";a:9:{s:13:\"sidebar_first\";s:12:\"Left sidebar\";s:14:\"sidebar_second\";s:13:\"Right sidebar\";s:7:\"content\";s:7:\"Content\";s:6:\"header\";s:6:\"Header\";s:6:\"footer\";s:6:\"Footer\";s:11:\"highlighted\";s:11:\"Highlighted\";s:4:\"help\";s:4:\"Help\";s:8:\"page_top\";s:8:\"Page top\";s:11:\"page_bottom\";s:11:\"Page bottom\";}s:8:\"features\";a:9:{i:0;s:4:\"logo\";i:1;s:7:\"favicon\";i:2;s:4:\"name\";i:3;s:6:\"slogan\";i:4;s:17:\"node_user_picture\";i:5;s:20:\"comment_user_picture\";i:6;s:25:\"comment_user_verification\";i:7;s:9:\"main_menu\";i:8;s:14:\"secondary_menu\";}s:10:\"screenshot\";s:27:\"themes/stark/screenshot.png\";s:3:\"php\";s:5:\"5.2.4\";s:7:\"scripts\";a:0:{}s:5:\"mtime\";i:1444866674;s:14:\"regions_hidden\";a:2:{i:0;s:8:\"page_top\";i:1;s:11:\"page_bottom\";}s:28:\"overlay_supplemental_regions\";a:1:{i:0;s:8:\"page_top\";}}",
 ))
 ->execute();
-
 $connection->schema()->createTable('taxonomy_index', array(
   'fields' => array(
     'nid' => array(
@@ -49556,7 +49505,6 @@
   'created' => '1504715432',
 ))
 ->execute();
-
 $connection->schema()->createTable('taxonomy_term_data', array(
   'fields' => array(
     'tid' => array(
@@ -49755,7 +49703,6 @@
   'weight' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('taxonomy_term_hierarchy', array(
   'fields' => array(
     'tid' => array(
@@ -49858,7 +49805,6 @@
   'parent' => '6',
 ))
 ->execute();
-
 $connection->schema()->createTable('taxonomy_vocabulary', array(
   'fields' => array(
     'vid' => array(
@@ -49957,7 +49903,6 @@
   'weight' => '0',
 ))
 ->execute();
-
 $connection->schema()->createTable('tracker_node', array(
   'fields' => array(
     'nid' => array(
@@ -49999,7 +49944,6 @@
   'changed' => '1421727536',
 ))
 ->execute();
-
 $connection->schema()->createTable('tracker_user', array(
   'fields' => array(
     'nid' => array(
@@ -50050,7 +49994,6 @@
   'changed' => '1421727536',
 ))
 ->execute();
-
 $connection->schema()->createTable('trigger_assignments', array(
   'fields' => array(
     'hook' => array(
@@ -50091,7 +50034,6 @@
   'weight' => '1',
 ))
 ->execute();
-
 $connection->schema()->createTable('url_alias', array(
   'fields' => array(
     'pid' => array(
@@ -50169,7 +50111,6 @@
   'language' => 'und',
 ))
 ->execute();
-
 $connection->schema()->createTable('users', array(
   'fields' => array(
     'uid' => array(
@@ -50347,7 +50288,6 @@
   'data' => 'a:1:{s:7:"contact";i:1;}',
 ))
 ->execute();
-
 $connection->schema()->createTable('users_roles', array(
   'fields' => array(
     'uid' => array(
@@ -50390,7 +50330,6 @@
   'rid' => '3',
 ))
 ->execute();
-
 $connection->schema()->createTable('variable', array(
   'fields' => array(
     'name' => array(
@@ -50573,12 +50512,12 @@
   'value' => 'a:9:{s:3:"top";s:7:"#d0d0d0";s:6:"bottom";s:7:"#c2c4c5";s:2:"bg";s:7:"#ffffff";s:7:"sidebar";s:7:"#ffffff";s:14:"sidebarborders";s:7:"#cccccc";s:6:"footer";s:7:"#24272c";s:11:"titleslogan";s:7:"#000000";s:4:"text";s:7:"#4a4a4a";s:4:"link";s:7:"#019dbf";}',
 ))
 ->values(array(
-  'name' => 'color_bartik_stylesheets',
-  'value' => 'a:1:{i:0;s:41:"public://color/bartik-e0e23ad7/colors.css";}',
+  'name' => 'color_bartik_screenshot',
+  'value' => 's:72:"/var/www/drupal/sites/default/files/color/bartik-b69cfcec/screenshot.png";',
 ))
 ->values(array(
-  'name' => 'color_bartik_screenshot',
-  'value' => 's:72:"/var/www/drupal/sites/default/files/color/bartik-b69cfcec/screenshot.png";'
+  'name' => 'color_bartik_stylesheets',
+  'value' => 'a:1:{i:0;s:41:"public://color/bartik-e0e23ad7/colors.css";}',
 ))
 ->values(array(
   'name' => 'color_garland_files',
@@ -50586,7 +50525,7 @@
 ))
 ->values(array(
   'name' => 'color_garland_logo',
-  'value' => 's:40:"public://color/garland-b69cfcec/logo.png";'
+  'value' => 's:40:"public://color/garland-b69cfcec/logo.png";',
 ))
 ->values(array(
   'name' => 'color_garland_palette',
@@ -50594,7 +50533,7 @@
 ))
 ->values(array(
   'name' => 'color_garland_screenshot',
-  'value' => 's:73:"/var/www/drupal/sites/default/files/color/garland-b69cfcec/screenshot.png";'
+  'value' => 's:73:"/var/www/drupal/sites/default/files/color/garland-b69cfcec/screenshot.png";',
 ))
 ->values(array(
   'name' => 'color_garland_stylesheets',
@@ -50856,6 +50795,10 @@
   'name' => 'empty_timezone_message',
   'value' => 'b:1;',
 ))
+->values(array(
+  'name' => 'entityreference:base-tables',
+  'value' => 'a:6:{s:7:"comment";a:2:{i:0;s:7:"comment";i:1;s:3:"cid";}s:4:"node";a:2:{i:0;s:4:"node";i:1;s:3:"nid";}s:4:"file";a:2:{i:0;s:12:"file_managed";i:1;s:3:"fid";}s:13:"taxonomy_term";a:2:{i:0;s:18:"taxonomy_term_data";i:1;s:3:"tid";}s:19:"taxonomy_vocabulary";a:2:{i:0;s:19:"taxonomy_vocabulary";i:1;s:3:"vid";}s:4:"user";a:2:{i:0;s:5:"users";i:1;s:3:"uid";}}',
+))
 ->values(array(
   'name' => 'entity_translation_entity_types',
   'value' => 'a:4:{s:7:"comment";s:7:"comment";s:4:"node";s:4:"node";s:13:"taxonomy_term";s:13:"taxonomy_term";s:4:"user";s:4:"user";}',
@@ -50892,10 +50835,6 @@
   'name' => 'feed_item_length',
   'value' => 's:8:"fulltext";',
 ))
-->values(array(
-  'name' => 'entityreference:base-tables',
-  'value' => 'a:6:{s:7:"comment";a:2:{i:0;s:7:"comment";i:1;s:3:"cid";}s:4:"node";a:2:{i:0;s:4:"node";i:1;s:3:"nid";}s:4:"file";a:2:{i:0;s:12:"file_managed";i:1;s:3:"fid";}s:13:"taxonomy_term";a:2:{i:0;s:18:"taxonomy_term_data";i:1;s:3:"tid";}s:19:"taxonomy_vocabulary";a:2:{i:0;s:19:"taxonomy_vocabulary";i:1;s:3:"vid";}s:4:"user";a:2:{i:0;s:5:"users";i:1;s:3:"uid";}}',
-))
 ->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:{}}}',
@@ -50972,6 +50911,10 @@
   'name' => 'forum_per_page',
   'value' => 'i:25;',
 ))
+->values(array(
+  'name' => 'i18n_node_options_blog',
+  'value' => 'a:2:{i:0;s:8:"required";i:1;s:4:"lock";}',
+))
 ->values(array(
   'name' => 'image_jpeg_quality',
   'value' => 'i:80;',
@@ -51020,10 +50963,6 @@
   'name' => 'language_content_type_test_content_type',
   'value' => 's:1:"4";',
 ))
-->values(array(
-  'name' => 'i18n_node_options_blog',
-  'value' => 'a:2:{i:0;s:8:"required";i:1;s:4:"lock";}',
-))
 ->values(array(
   'name' => 'language_count',
   'value' => 'i:3;',
@@ -51384,6 +51323,10 @@
   'name' => 'teaser_length',
   'value' => 'i:1024;',
 ))
+->values(array(
+  'name' => 'theme_bartik_settings',
+  'value' => 'a:18:{s:11:"toggle_logo";i:1;s:11:"toggle_name";i:1;s:13:"toggle_slogan";i:1;s:24:"toggle_node_user_picture";i:1;s:27:"toggle_comment_user_picture";i:1;s:32:"toggle_comment_user_verification";i:1;s:14:"toggle_favicon";i:1;s:16:"toggle_main_menu";i:1;s:21:"toggle_secondary_menu";i:1;s:12:"default_logo";i:0;s:9:"logo_path";s:16:"public://gnu.png";s:15:"default_favicon";i:1;s:12:"favicon_path";s:0:"";s:14:"favicon_upload";s:0:"";s:6:"scheme";s:7:"default";s:7:"palette";a:9:{s:3:"top";s:7:"#0779bf";s:6:"bottom";s:7:"#48a9e4";s:2:"bg";s:7:"#ffffff";s:7:"sidebar";s:7:"#f6f6f2";s:14:"sidebarborders";s:7:"#f9f9f9";s:6:"footer";s:7:"#292929";s:11:"titleslogan";s:7:"#fffeff";s:4:"text";s:7:"#3b3b3b";s:4:"link";s:7:"#0071B3";}s:5:"theme";s:6:"bartik";s:4:"info";a:12:{s:6:"fields";a:9:{s:3:"top";s:10:"Header top";s:6:"bottom";s:13:"Header bottom";s:2:"bg";s:15:"Main background";s:7:"sidebar";s:18:"Sidebar background";s:14:"sidebarborders";s:15:"Sidebar borders";s:6:"footer";s:17:"Footer background";s:11:"titleslogan";s:16:"Title and slogan";s:4:"text";s:10:"Text color";s:4:"link";s:10:"Link color";}s:7:"schemes";a:6:{s:7:"default";a:2:{s:5:"title";s:21:"Blue Lagoon (default)";s:6:"colors";a:9:{s:3:"top";s:7:"#0779bf";s:6:"bottom";s:7:"#48a9e4";s:2:"bg";s:7:"#ffffff";s:7:"sidebar";s:7:"#f6f6f2";s:14:"sidebarborders";s:7:"#f9f9f9";s:6:"footer";s:7:"#292929";s:11:"titleslogan";s:7:"#fffeff";s:4:"text";s:7:"#3b3b3b";s:4:"link";s:7:"#0071B3";}}s:9:"firehouse";a:2:{s:5:"title";s:9:"Firehouse";s:6:"colors";a:9:{s:3:"top";s:7:"#cd2d2d";s:6:"bottom";s:7:"#cf3535";s:2:"bg";s:7:"#ffffff";s:7:"sidebar";s:7:"#f1f4f0";s:14:"sidebarborders";s:7:"#ededed";s:6:"footer";s:7:"#1f1d1c";s:11:"titleslogan";s:7:"#fffeff";s:4:"text";s:7:"#3b3b3b";s:4:"link";s:7:"#d6121f";}}s:3:"ice";a:2:{s:5:"title";s:3:"Ice";s:6:"colors";a:9:{s:3:"top";s:7:"#d0d0d0";s:6:"bottom";s:7:"#c2c4c5";s:2:"bg";s:7:"#ffffff";s:7:"sidebar";s:7:"#ffffff";s:14:"sidebarborders";s:7:"#cccccc";s:6:"footer";s:7:"#24272c";s:11:"titleslogan";s:7:"#000000";s:4:"text";s:7:"#4a4a4a";s:4:"link";s:7:"#019dbf";}}s:4:"plum";a:2:{s:5:"title";s:4:"Plum";s:6:"colors";a:9:{s:3:"top";s:7:"#4c1c58";s:6:"bottom";s:7:"#593662";s:2:"bg";s:7:"#fffdf7";s:7:"sidebar";s:7:"#edede7";s:14:"sidebarborders";s:7:"#e7e7e7";s:6:"footer";s:7:"#2c2c28";s:11:"titleslogan";s:7:"#ffffff";s:4:"text";s:7:"#301313";s:4:"link";s:7:"#9d408d";}}s:5:"slate";a:2:{s:5:"title";s:5:"Slate";s:6:"colors";a:9:{s:3:"top";s:7:"#4a4a4a";s:6:"bottom";s:7:"#4e4e4e";s:2:"bg";s:7:"#ffffff";s:7:"sidebar";s:7:"#ffffff";s:14:"sidebarborders";s:7:"#d0d0d0";s:6:"footer";s:7:"#161617";s:11:"titleslogan";s:7:"#ffffff";s:4:"text";s:7:"#3b3b3b";s:4:"link";s:7:"#0073b6";}}s:0:"";a:2:{s:5:"title";s:6:"Custom";s:6:"colors";a:0:{}}}s:3:"css";a:1:{i:0;s:14:"css/colors.css";}s:4:"copy";a:1:{i:0;s:8:"logo.png";}s:9:"gradients";a:1:{i:0;a:3:{s:9:"dimension";a:4:{i:0;i:0;i:1;i:0;i:2;i:0;i:3;i:0;}s:9:"direction";s:8:"vertical";s:6:"colors";a:2:{i:0;s:3:"top";i:1;s:6:"bottom";}}}s:4:"fill";a:0:{}s:6:"slices";a:0:{}s:12:"blend_target";s:7:"#ffffff";s:11:"preview_css";s:17:"color/preview.css";s:10:"preview_js";s:16:"color/preview.js";s:12:"preview_html";s:18:"color/preview.html";s:10:"base_image";s:14:"color/base.png";}}',
+))
 ->values(array(
   'name' => 'theme_default',
   'value' => 's:6:"bartik";',
@@ -51392,10 +51335,6 @@
   'name' => 'theme_settings',
   'value' => 'a:16:{s:11:"toggle_logo";i:0;s:11:"toggle_name";i:1;s:13:"toggle_slogan";i:0;s:24:"toggle_node_user_picture";i:0;s:27:"toggle_comment_user_picture";i:0;s:32:"toggle_comment_user_verification";i:0;s:14:"toggle_favicon";i:0;s:16:"toggle_main_menu";i:0;s:21:"toggle_secondary_menu";i:0;s:12:"default_logo";i:1;s:9:"logo_path";s:23:"public://customlogo.png";s:11:"logo_upload";s:0:"";s:15:"default_favicon";i:0;s:12:"favicon_path";s:24:"public://somefavicon.png";s:14:"favicon_upload";s:0:"";s:16:"favicon_mimetype";s:9:"image/png";}',
 ))
-->values(array(
-  'name' => 'theme_bartik_settings',
-  'value' => 'a:18:{s:11:"toggle_logo";i:1;s:11:"toggle_name";i:1;s:13:"toggle_slogan";i:1;s:24:"toggle_node_user_picture";i:1;s:27:"toggle_comment_user_picture";i:1;s:32:"toggle_comment_user_verification";i:1;s:14:"toggle_favicon";i:1;s:16:"toggle_main_menu";i:1;s:21:"toggle_secondary_menu";i:1;s:12:"default_logo";i:0;s:9:"logo_path";s:16:"public://gnu.png";s:15:"default_favicon";i:1;s:12:"favicon_path";s:0:"";s:14:"favicon_upload";s:0:"";s:6:"scheme";s:7:"default";s:7:"palette";a:9:{s:3:"top";s:7:"#0779bf";s:6:"bottom";s:7:"#48a9e4";s:2:"bg";s:7:"#ffffff";s:7:"sidebar";s:7:"#f6f6f2";s:14:"sidebarborders";s:7:"#f9f9f9";s:6:"footer";s:7:"#292929";s:11:"titleslogan";s:7:"#fffeff";s:4:"text";s:7:"#3b3b3b";s:4:"link";s:7:"#0071B3";}s:5:"theme";s:6:"bartik";s:4:"info";a:12:{s:6:"fields";a:9:{s:3:"top";s:10:"Header top";s:6:"bottom";s:13:"Header bottom";s:2:"bg";s:15:"Main background";s:7:"sidebar";s:18:"Sidebar background";s:14:"sidebarborders";s:15:"Sidebar borders";s:6:"footer";s:17:"Footer background";s:11:"titleslogan";s:16:"Title and slogan";s:4:"text";s:10:"Text color";s:4:"link";s:10:"Link color";}s:7:"schemes";a:6:{s:7:"default";a:2:{s:5:"title";s:21:"Blue Lagoon (default)";s:6:"colors";a:9:{s:3:"top";s:7:"#0779bf";s:6:"bottom";s:7:"#48a9e4";s:2:"bg";s:7:"#ffffff";s:7:"sidebar";s:7:"#f6f6f2";s:14:"sidebarborders";s:7:"#f9f9f9";s:6:"footer";s:7:"#292929";s:11:"titleslogan";s:7:"#fffeff";s:4:"text";s:7:"#3b3b3b";s:4:"link";s:7:"#0071B3";}}s:9:"firehouse";a:2:{s:5:"title";s:9:"Firehouse";s:6:"colors";a:9:{s:3:"top";s:7:"#cd2d2d";s:6:"bottom";s:7:"#cf3535";s:2:"bg";s:7:"#ffffff";s:7:"sidebar";s:7:"#f1f4f0";s:14:"sidebarborders";s:7:"#ededed";s:6:"footer";s:7:"#1f1d1c";s:11:"titleslogan";s:7:"#fffeff";s:4:"text";s:7:"#3b3b3b";s:4:"link";s:7:"#d6121f";}}s:3:"ice";a:2:{s:5:"title";s:3:"Ice";s:6:"colors";a:9:{s:3:"top";s:7:"#d0d0d0";s:6:"bottom";s:7:"#c2c4c5";s:2:"bg";s:7:"#ffffff";s:7:"sidebar";s:7:"#ffffff";s:14:"sidebarborders";s:7:"#cccccc";s:6:"footer";s:7:"#24272c";s:11:"titleslogan";s:7:"#000000";s:4:"text";s:7:"#4a4a4a";s:4:"link";s:7:"#019dbf";}}s:4:"plum";a:2:{s:5:"title";s:4:"Plum";s:6:"colors";a:9:{s:3:"top";s:7:"#4c1c58";s:6:"bottom";s:7:"#593662";s:2:"bg";s:7:"#fffdf7";s:7:"sidebar";s:7:"#edede7";s:14:"sidebarborders";s:7:"#e7e7e7";s:6:"footer";s:7:"#2c2c28";s:11:"titleslogan";s:7:"#ffffff";s:4:"text";s:7:"#301313";s:4:"link";s:7:"#9d408d";}}s:5:"slate";a:2:{s:5:"title";s:5:"Slate";s:6:"colors";a:9:{s:3:"top";s:7:"#4a4a4a";s:6:"bottom";s:7:"#4e4e4e";s:2:"bg";s:7:"#ffffff";s:7:"sidebar";s:7:"#ffffff";s:14:"sidebarborders";s:7:"#d0d0d0";s:6:"footer";s:7:"#161617";s:11:"titleslogan";s:7:"#ffffff";s:4:"text";s:7:"#3b3b3b";s:4:"link";s:7:"#0073b6";}}s:0:"";a:2:{s:5:"title";s:6:"Custom";s:6:"colors";a:0:{}}}s:3:"css";a:1:{i:0;s:14:"css/colors.css";}s:4:"copy";a:1:{i:0;s:8:"logo.png";}s:9:"gradients";a:1:{i:0;a:3:{s:9:"dimension";a:4:{i:0;i:0;i:1;i:0;i:2;i:0;i:3;i:0;}s:9:"direction";s:8:"vertical";s:6:"colors";a:2:{i:0;s:3:"top";i:1;s:6:"bottom";}}}s:4:"fill";a:0:{}s:6:"slices";a:0:{}s:12:"blend_target";s:7:"#ffffff";s:11:"preview_css";s:17:"color/preview.css";s:10:"preview_js";s:16:"color/preview.js";s:12:"preview_html";s:18:"color/preview.html";s:10:"base_image";s:14:"color/base.png";}}',
-))
 ->values(array(
   'name' => 'theme_seven_settings',
   'value' => 'a:15:{s:11:"toggle_logo";i:1;s:11:"toggle_name";i:1;s:13:"toggle_slogan";i:1;s:24:"toggle_node_user_picture";i:1;s:27:"toggle_comment_user_picture";i:0;s:32:"toggle_comment_user_verification";i:1;s:14:"toggle_favicon";i:1;s:16:"toggle_main_menu";i:1;s:21:"toggle_secondary_menu";i:0;s:12:"default_logo";i:1;s:9:"logo_path";s:0:"";s:11:"logo_upload";s:0:"";s:15:"default_favicon";i:1;s:12:"favicon_path";s:0:"";s:14:"favicon_upload";s:0:"";}',
@@ -51585,7 +51524,6 @@
   'value' => 'a:3:{i:0;s:9:"site_name";i:1;s:11:"site_slogan";i:2;s:24:"maintenance_mode_message";}',
 ))
 ->execute();
-
 $connection->schema()->createTable('variable_store', array(
   'fields' => array(
     'realm' => array(
@@ -51643,71 +51581,71 @@
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'is',
-  'name' => 'maintenance_mode_message',
-  'value' => 'is - This is a custom maintenance mode message.',
+  'name' => 'anonymous',
+  'value' => 'is - anonymous',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'is',
-  'name' => 'site_403',
-  'value' => 'node/1',
+  'name' => 'maintenance_mode_message',
+  'value' => 'is - This is a custom maintenance mode message.',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
-  'realm_key' => 'is',
-  'name' => 'site_404',
-  'value' => 'node/6',
+  'realm_key' => 'fr',
+  'name' => 'site_403',
+  'value' => 'node',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'is',
-  'name' => 'site_frontpage',
-  'value' => 'node/4',
+  'name' => 'site_403',
+  'value' => 'node/1',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
-  'realm_key' => 'is',
-  'name' => 'site_name',
-  'value' => 'is - The Site Name',
+  'realm_key' => 'fr',
+  'name' => 'site_404',
+  'value' => 'node',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'is',
-  'name' => 'site_slogan',
-  'value' => 'is - The Slogan',
+  'name' => 'site_404',
+  'value' => 'node/6',
   'serialized' => '0',
 ))
-  ->values(array(
+->values(array(
   'realm' => 'language',
   'realm_key' => 'fr',
-  'name' => 'site_403',
+  'name' => 'site_frontpage',
   'value' => 'node',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
-  'realm_key' => 'fr',
-  'name' => 'site_404',
-  'value' => 'node',
+  'realm_key' => 'is',
+  'name' => 'site_frontpage',
+  'value' => 'node/4',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'fr',
-  'name' => 'site_frontpage',
-  'value' => 'node',
+  'name' => 'site_name',
+  'value' => 'The Site Name',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
-  'realm_key' => 'fr',
+  'realm_key' => 'is',
   'name' => 'site_name',
-  'value' => 'The Site Name',
+  'value' => 'is - The Site Name',
   'serialized' => '0',
 ))
 ->values(array(
@@ -51717,6 +51655,13 @@
   'value' => 'fr - The Slogan',
   'serialized' => '0',
 ))
+->values(array(
+  'realm' => 'language',
+  'realm_key' => 'is',
+  'name' => 'site_slogan',
+  'value' => 'is - The Slogan',
+  'serialized' => '0',
+))
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'en',
@@ -51843,15 +51788,7 @@
   'value' => 'is - So long, bub',
   'serialized' => '0',
 ))
-->values(array(
-  'realm' => 'language',
-  'realm_key' => 'is',
-  'name' => 'anonymous',
-  'value' => 'is - anonymous',
-   'serialized' => '0',
-))
 ->execute();
-
 $connection->schema()->createTable('watchdog', array(
   'fields' => array(
     'wid' => array(