fixes #2656 error connecting to vsphere after upgrade to ruby 1.9.3
(cherry picked from commit 617ee75f8c0f8d239564f3fd48d92a2d772eeb8b)

fixes #2669 username first name and last name doesn't accept i18n characters
(cherry picked from commit aa925f8009b7024dbb77c797d95c14b2e725a1d7)

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)

Fixes #2643 - Check for operatingsystem before orchestrating TFTP
(cherry picked from commit d2e50bbbf7d84fde6d846f5a821cf7e2c28fbfb3)

Fixes #2644 - Refactor Host find_by_name to use several ways to find a
host, and refactor my_hosts scope to Host::Base, allowing us to remove
unnecessary permissions check from find_by_name
(cherry picked from commit 5b5af86ecd6f6b147aeb4dd4ceadd890dc9f2699)

fixes #2343 - override default settings with custom values

- added check for nil before attribute 'default' is loaded from yaml
- removed logic that tried to set 'value' attr to nil when it was equal to 'default';
it didn't behave predictably as 'default' can be assigned after 'value'...

Use facts[:operatingsystemrelease] to determined gentoo release
(cherry picked from commit ef3a1338a05c0d8689dfa87ec7cd6f4bc07312f7)

fixes #1938 Foreman shouldn't use the FQDN fact to identify the node when facts are uploaded
(cherry picked from commit baeb54f19a67ef8e5fbce513548cda1653341e17)

fixes #2631 - fix remote code execution via controller name (CVE-2013-2121)
(cherry picked from commit ef4b97d177c58c9532730d53dca0517bc869a0ce)

Conflicts:
app/views/common/_puppetclasses_or_envs_changed.html.erb