fixes #1938 Foreman shouldn't use the FQDN fact to identify the node when facts are uploaded
(cherry picked from commit baeb54f19a67ef8e5fbce513548cda1653341e17)
fixes #2622 - error messages with HTML properly escaped
(cherry picked from commit c8d1c6d713cc412bc4ab30b74e60e2ff98d8b74a)
Use facts[:operatingsystemrelease] to determined gentoo release
(cherry picked from commit ef3a1338a05c0d8689dfa87ec7cd6f4bc07312f7)
fixes #2633 - enable generate_token rake task to run from elsewhere
(cherry picked from commit a5f4453257060e0e02b7fdd7498e2f5936c38a27)
fixes #2636 host submit missing progress-bar when installed at sub-domain
(cherry picked from commit 92326dd2588338079a10f11c676380d75b3a4d1f)
Fixes #2641 - Add type_changed check to JS to allow form to refresh when provisioning a discovered host
(cherry picked from commit c5e90813c8cb1e031ae43dd6f00b359119958a19)
Fixes #2642 - Display build button if host type has changed
(cherry picked from commit 4cdd3291c6756d966ae52b7dc6cdc6a9fdf855fb)
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'
(cherry picked from commit 911d3f5c8f68d7a6daf89296b92af37d546ce95a)
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
- create! is now prefered method for creating settings as it raises exceptions on invalid states
- setting takes string as default type when parsing values from user input
(cherry picked from commit 8da68b88093f497491a20f337d4e658addad7432)
fixes #2334 - location matcher doesn't match on smart parameters
(cherry picked from commit c7f527779d80e1cc78e1f3b02a6ba7bfc081a95d)
Fixes #2657 - Use twitter-bootstrap-rails version 2.2.6
(cherry picked from commit a8d06d2d9289ac925d4a2d5ec1c52665c100830f)
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 #2583 - error message is now properly i18n-ed
(cherry picked from commit 8f3d76af2aa55d486b2d52558aa91e2d62cafbe3)
fixes #2649 - adding missing devel deps

Also sorting lines using vim :sort u
(cherry picked from commit 63e9d258a31964ccd6410a6cddb5b576ae1ab3c2)
Fixes #2667 - Don't save during process_hostgroup
(cherry picked from commit b751fea393439dc653e90d2aa9d06b4015797c9f)
fixes #2650 - adding minitest dependency for console
(cherry picked from commit 95234b21bc9fba36206274f8996a0f933b2d4d33)