Merge remote-tracking branch 'origin/master' into 27188_memcache

Author: marcelovani

chain/chain-site-rebuild.yml

@@ -39,11 +39,15 @@ commands:
   - command: site:db:import
     arguments:
       name: '%{{name}}'
+# Import configuration
+  - command: exec
+    arguments:
+      bin: 'cd /vagrant/repos/%{{name}}/web; drush cim -y;'
 # Run db updates
   - command: exec
     arguments:
       bin: 'cd /vagrant/repos/%{{name}}/web; drush updb -y;'
-# Import configuration
+# Import configuration again to fix a problem with config import when new modules are added to core.extensions.yml
   - command: exec
     arguments:
       bin: 'cd /vagrant/repos/%{{name}}/web; drush cim -y;'

scripts/site_rebuild.sh

@@ -11,6 +11,7 @@ drupal site:phpunit:setup ${SITENAME} && \
 drupal site:behat:setup ${SITENAME} && \
 drupal site:settings:memcache ${SITENAME} && \
 drupal site:db:import ${SITENAME} && \
+cd /vagrant/repos/${SITENAME}/web && drush cim -y && \
 cd /vagrant/repos/${SITENAME}/web && drush updb -y && \
 cd /vagrant/repos/${SITENAME}/web && drush cim -y && \
 cd /vagrant/repos/${SITENAME}/web && drush cr

src/Command/SiteDbImportCommand.php

@@ -142,7 +142,8 @@ protected function execute(InputInterface $input, OutputInterface $output) {
         'cd %s && ' .
         'chmod 777 ../default && ' .
         'chmod 777 settings.php && ' .
-        'drush si -y %s %s',
+        'drush si -y %s %s && ' .
+        'drush cset "system.site" uuid "$(drush cget system.site uuid --source=sync --format=list)" -y',
         $this->shellPath($this->destination),
         $this->profile,
         $options