fixes #2646 Asset icon URLs are incorrect when under a different base URL
(cherry picked from commit 1546388e9c82f6382be1ec35738489e8c9458c69)

refresh locales

fixes #2670 - fix apostrophe quoting issue
(cherry picked from commit 4298bd841c3fb2b3f639f06d4cbbb3901f56ec06)
(cherry picked from commit be36bef41104ff5ca26cfb36818bdc1cbc7f5b15)

Fixes #2667 - Don't save during process_hostgroup
(cherry picked from commit b751fea393439dc653e90d2aa9d06b4015797c9f)

fixes #2583 - error message is now properly i18n-ed
(cherry picked from commit 8f3d76af2aa55d486b2d52558aa91e2d62cafbe3)

Fixes #2619 - don't display full output from proxy

Proxy output is logged alongside with backtrace of exception. We display
only exception message in UI.
(cherry picked from commit a933fc25b6374cf02685b5499f422ae97dec79f7)

Fixes #2640 - use relative user logout path
(cherry picked from commit 1ff6a50c16ef6e8bf8b1aa709ec2f8769ba70d79)

fixes #2663 javascript errors on the host form
(cherry picked from commit d592994bf9554dcbffbbc3895e76d5646f4739fb)

fixes #2660 - settings, improve tests and fixes

- added string settings type
- fixed tests previously commented out due to CI failures
- more tests for core settings functionality
- parsing of string values enhanced and extracted to a separate method
- setting value to nil when it equals default is back...

fixes #2334 - location matcher doesn't match on smart parameters
(cherry picked from commit c7f527779d80e1cc78e1f3b02a6ba7bfc081a95d)