Merge branch 'develop' into composer

Author: miromichalicka

docroot/sites/default/settings/includes.settings.php

@@ -96,6 +96,7 @@
  */
 $config['shield.settings']['allow_cli'] = TRUE;
 if (isset($_SERVER['HTTP_HOST']) && !in_array($base_url, $unshielded)) {
+  $config['shield.settings']['shield_enable'] = TRUE;
   $config['shield.settings']['credentials']['shield']['user'] = 'drupal';
   $config['shield.settings']['credentials']['shield']['pass'] = 'cz';
   $config['shield.settings']['print'] = 'Check out https://github.com/Drupalcz/drupalcz ;-)';