fixes #4639 - array in lookup_value incorrectly displayed in form

(cherry picked from commit 801a90d196d363aadae7bf2be9347ff6e46e0471)

fixes #5436 - provisioning templates are world accessible

(cherry picked from commit aa0ebe8eef311875695135c1714cb09225e8cd13)

Remove test erroneously pulled from develop

fixes #4457 - Session fixation, new session IDs are not generated on login (CVE-2014-0090)

(cherry picked from commit cfa4b52638173b9cf77ee1a5fd0c3a273f875209)

Conflicts:
test/functional/users_controller_test.rb

Fixes #4680 - Don't append periods to unqualified unmanaged hosts

(cherry picked from commit 014c9ab5eb9bb9b8d655d48a8ccd540613390788)

fixes #4314 - ignore default scope ordering on host search by puppet class

(cherry picked from commit a44dd0943b5ccc2c2e9a0ce264e4b2f38b5edd4d)

Conflicts:
app/models/concerns/hostext/search.rb

fixes #4268 - don't search for host with nil IP on hostname spoofing

(cherry picked from commit 1e0fd283180dc6bda30c880898cdea69cb579194)

Conflicts:
test/fixtures/hosts.yml

Fixes #4221: add :dependent => :destroy for compute profiles on compute resource

(cherry picked from commit 6e7682a967c9e3dc37d244146b22d7dc2cb7103e)

fixes #3845 - user login session ending clears chosen organization

(cherry picked from commit f639fdcfb04d2795396d66e64cfb58e300a63188)

fixes #3596 - validation error when user with hostgroup subscription creates a new hostgroup

(cherry picked from commit de7cb88710f028bc33ae9257d185abf0b73554d5)

fixes #3519 - taxonomies include authorization module

(cherry picked from commit 14fdd9046dd3b85979bf95b4d0019e00051e35c2)

fixes #4298 - ldap auth should accept parens in firstname or surname

(cherry picked from commit 3065cbc2df440c77e20abeed9fa525221fdcb12f)

fixes #2726 - smart class parameter override fails validation

(cherry picked from commit cfc2bb662f49d8216c2388ab35dd87af295474d0)

fixes #4234 - cannot edit host's puppet parameters

(cherry picked from commit 130f301a508ae31549145e5fa9b176f42dc20995)

fixes #4005 - ensure standalone Rabl.render works outside of a controller

(cherry picked from commit 858708c466398ac5f42bb1bb0fd6c1e531e31385)

fixes #2866 - Changing a hostgroup name doesn't update associated Smart Variable matchers

(cherry picked from commit 709ad8d6f425e0817d3faef2cc629af1458cb1c9)

fixes #3960 - wrap APIv2 errors in an "error" node

(cherry picked from commit 0f7d219a4a65cd795eecd05117b08511d9025de2)

refs #3697, #3701 - fix test with multiple validation failures

(cherry picked from commit dbaa47b718a25992065cc6e0afea78bed1171f7e)

fixes #3697, #3701 - more comprehensive field validations

(cherry picked from commit 4bae5cedb8ab562b6c397234c5cb1cfd604fde74)

fixes #3955 - added param_true? and snippet_if_exist template methods

(cherry picked from commit 3701a8d1c6d698ea8c57321eed2f87c74bd57728)

fixes #3920 - prevent 500 ScopedSearch errors on the API, raise UI errors correctly

(cherry picked from commit f9bc5a8e5934aac9bd8d5488f84717d33e359501)

fixes #359 - hostname spoofing for unattended installation templates

(cherry picked from commit 5b70f0e0232bff3e580923f485bc0bd1816d9279)

fixes #3760 - API v2 define metadata @total for each controller

(cherry picked from commit 6f9438866488180e196ff18e1372cf0773afe7b9)

Conflicts:
foreman.spec

fixes #3998 - API v2 error on /api/compute_resources, missing gce.json.rabl

(cherry picked from commit 9926d4d3f87e439d2eaa36f5d54b07d71c57c3fe)

fixes #3867 - Wrong Compute Resource type shown on overview

(cherry picked from commit 2ebd2f227aef16da62c7884065bb9b47a846c9a3)

fixes #2231 - hostgroup deletion is restricted to hostgroups without children

(cherry picked from commit 8c68024ac619121312680ee8afc467857155e71d)

Fixes #4022: Make api puppetrun a PUT for REST standards

(cherry picked from commit bc11c17bcc66fbec3a71be920efa4de32d508ecb)

fixes #3515 - API handles not found objects with 404

(cherry picked from commit 46338cd73c542ecc3aa045b45e831434792c710e)

Fixes #4020 - enable @static to work on all OS template types

fixes #3906 - Support for Junos ZTP

fixes #3099 - Adding parameters to locations and organizations

fixes #3709 - explicitly say puppet environments vs just 'environments'

Fixes #3962 - Refactor class overwriting

fixes #3178 - add feature for compute profiles for hostgroups and hosts

fixes #3528 - Populate first name, last name, and email, if available.

fixes #3658 - support smart proxy's chef proxy feature

fixes #3937 - correct title wording for Compute Resources and Smart Proxies

fixes #1489 - add AIX family and facts importer support

refs #3928 - use updated test fixture

fixes #3928 - API v2 - update os_default_templates for operating system

refs #3930 - ensure a user can actually update itself.

fixes #3930 - refactoring of edit_self implementation.

fixes #3811 - merge with new layout

fixes #3752 - move data population from migrations into seed script

fixes #3280 - authenticate returns true for API requests when login:false

fixes #3339 - nested fact support, allow fact importers to be registered by plugins

fixes #3693 - API v2 - accept GET json format of object in PUT/POST requests to add/remove has_many associations

fixes #3885 - sort IDs in test to prevent random failures

Fixes #3721 - Map OS family to a display variant

Fixes #3720 - Add description field to operatingsystem

Fixes #3753 - always use main_app to determine paths for running an isolated namespace plugin

fixes #3491 - API v2 rabl templates base, main, show for each controller

fixes #2983 - Add autosign#index to API v1 and v2 and remove from UI controller

fixes #3794 - don't validate IP address that's later provided by a CR

fixes #3020 - API v2 - option to specify version in URL as well as in header

fixes #3646 - API v2 change default root name for api json single object response to no root node but make it configurable

fixes #3137 - API v2 - show error if optional nested object does not exist for nested route

fixes #3018 - API v2 metadata for pagination, search, order in index collection json response

fixes #3011 - default root node name for api collections json response to :results but make it configurable

fixes #3736 - users API uses login name as an identifying attribute

fixes #3673 - auditing added to ptable w/ test

fixes #3510 - plugin interface for registering a plugin, updated menu system

fixes #2763 - correcting doco links

fixes #3659 - use URL host for hostname, not URL itself

fixes #3661 - mis-redirection from /hosts/fqdn/edit to /hosts

fixes #3493 - check if auto user reg is allowed for auth source

Fixes #3468 - Move token expiry to scope to avoid FK issues

fixes #3603 - replaced a relation with a collection in 'where' conditions

fixes #3017 - split APIv2 controllers from v1 parents

fixes #3312 - support /users/extlogin as a login page based on REMOTE_USER

refs #3569 - fix URL validation test error on merge

Fixes #3569, #3210 - Use port from foreman_url for templates

fixes #3587, #2855 - print an error on invalid json vs 500 error

fixes #3597 - removing rr gem, make tests consistent by using just mocha

fixes #3566 - exposes orchestration tasks via the API at /api/orchestration/id/tasks

fixes #3577 - do not treat `params[:dryrun]` with value `false` as true

Fixes #3182 - Make IP optional in some circumstances

fixes #2951 - Host API documentation lacks compute_resource_id

fixes #3205 - Extract and refactor report importing logic

This patch extracts all report importing logic into seperate importer and status classes.
long term this could allow:

1. aliases methods for async operations
2. different types of reports imports (based on reporting type).

fixes #1830 - auto assign puppet proxy if its not defined upon facts/reports event

[REFACTOR] fixes #2967 - refactored Fact Importer

Based on Dmitri Dolguikh <dmitri@appliedlogic.ca> original patch.

- renamed original fact_importer class to fact_parser class
- moved fact handling logic to its own fact_importer class
- fact importer now assumes single-value facts...

fixes #3364 Add option to disable automatc host creation when a report is received

fixes #3140 - API to allow importing of puppet classes

Fixes #3293 add FactoryGirl to tests

fixes #3239 - pxelinux spoofing on postgres now works

fixes #2818 - validation of OS families in ptables

fixes #2741 - remove dash from -%> to %>

fixes #3136 - host cloning should auto-suggest a new IP address

fixes #3170 - dash separated mac address notation

fixes #3222 - nil the certname when handling certs if UUID certs have now been disabled

fixes #3111 - v2 API calls to /api/[class]/[object]/parameters/[parameter] return wrong object

fixes #3206 - prevent any user including admin from creating lookup_value with fdqn= or hostgroup= if host/hostgroup does not exist

fixes #3190 - Fix STI auditable_type - Audit should say updated Location/Organization rather than updated Taxonomy and ComputeResource should not use STI class

fixes #3048 - Non Admin user fails to override parameters when creating new host

fixes #3160 - sanitize host/host group names in lookup_value associations (CVE-2013-4386)

fixes #2756 - update setting descriptions at startup

Fixes #3177: a 'G' suffix is automatically appended to libvirt volume capacity value if none was specified

fixes #2975 added setting for using the shortname instead of FQDN for new virtual machines

Fixes #2244: avoid constantly changing os.release_name

Tests thanks to Sam Kottler <shk@redhat.com>

refs #3141 - added tests around Foreman::Controller::SmartProxyAuth