Merge pull request #13270 from civicrm/5.9

5.9

diff --cc CRM/Admin/Form/Setting/Localization.php
Simple merge

diff --cc CRM/Case/Task.php
Simple merge

diff --cc CRM/Core/BAO/ConfigSetting.php
Simple merge

diff --cc CRM/Core/I18n.php
Simple merge

diff --cc CRM/Core/Smarty.php
Simple merge

diff --cc CRM/Report/Form.php
Simple merge

diff --cc CRM/Report/Form/Contribute/Lybunt.php
Simple merge

diff --cc CRM/Report/Form/Contribute/Summary.php
Simple merge

diff --cc api/Exception.php
Simple merge

diff --cc settings/Localization.setting.php
Simple merge

diff --cc templates/CRM/Admin/Form/Setting/Localization.tpl
Simple merge

diff --cc tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
Simple merge

diff --cc tests/phpunit/CRM/Core/I18n/LocaleTest.php
Simple merge