Merge in 5.15

diff --cc settings/Core.setting.php
index f79f52ba4ec7469c399300ad589202a08803e214,2b8bdf3e04bad619f0e600a74696d5312a9141bc..2b3822705f89a410a8ca72b7fa4ebf1ab9d800f7
--- 1/settings/Core.setting.php
--- 2/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@@ -1062,46 -1062,23 +1062,65 @@@ return 
      'description' => ts('Acceptable Mime Types that can be used as part of file urls'),
      'help_text' => NULL,
    ],
 +  'theme_frontend' => [
 +    'group_name' => 'CiviCRM Preferences',
 +    'group' => 'core',
 +    'name' => 'theme_frontend',
 +    'type' => 'String',
 +    'quick_form_type' => 'Select',
 +    'html_type' => 'Select',
 +    'html_attributes' => array(
 +      'class' => 'crm-select2',
 +    ),
 +    'pseudoconstant' => array(
 +      'callback' => 'call://themes/getAvailable',
 +    ),
 +    'default' => 'default',
 +    'add' => '4.7',
 +    'title' => ts('Frontend Theme'),
 +    'is_domain' => 1,
 +    'is_contact' => 0,
 +    'description' => ts('Theme to use on frontend pages'),
 +    'help_text' => NULL,
 +  ],
 +  'theme_backend' => [
 +    'group_name' => 'CiviCRM Preferences',
 +    'group' => 'core',
 +    'name' => 'theme_backend',
 +    'type' => 'String',
 +    'quick_form_type' => 'Select',
 +    'html_type' => 'Select',
 +    'html_attributes' => array(
 +      'class' => 'crm-select2',
 +    ),
 +    'pseudoconstant' => array(
 +      'callback' => 'call://themes/getAvailable',
 +    ),
 +    'default' => 'default',
 +    'add' => '4.7',
 +    'title' => ts('Backend Theme'),
 +    'is_domain' => 1,
 +    'is_contact' => 0,
 +    'description' => ts('Theme to use on backend pages'),
 +    'help_text' => NULL,
 +  ],
+   'http_timeout' => [
+     'group_name' => 'CiviCRM Preferences',
+     'group' => 'core',
+     'name' => 'http_timeout',
+     'type' => 'Integer',
+     'quick_form_type' => 'Element',
+     'html_type' => 'text',
+     'html_attributes' => [
+       'size' => 2,
+       'maxlength' => 3,
+     ],
+     'default' => 5,
+     'add' => '5.15',
+     'title' => ts('HTTP request timeout'),
+     'is_domain' => 1,
+     'is_contact' => 0,
+     'description' => ts('How long should HTTP requests through Guzzle application run for in seconds'),
+     'help_text' => ts('Set the number of seconds http requests should run for before terminating'),
+   ],
  ];