fixes #4590 - convert VMware SCSI controller type during creation

(cherry picked from commit 7e27bdf3a593f0e2ac0661f4a3c9a9bb3ab6227c)

Conflicts:
app/models/compute_resources/foreman/model/vmware.rb
test/unit/compute_resources/vmware_test.rb

fixes #5609 - backport bugfix in hosts form when location is nil

This commit fixes a bug that has been fixed in
acfbc45886c4d81a2a3ca5af433a6124a0a7191a

fixes #4639 - array in lookup_value incorrectly displayed in form

(cherry picked from commit 801a90d196d363aadae7bf2be9347ff6e46e0471)

fixes #5132 hang when provisioning on ovirt 3.4

(cherry picked from commit 578e6f54462e785d6ae25cceb6fbdd6c21696cb8)

Conflicts:
app/models/concerns/fog_extensions/ovirt/server.rb

fixes #5436 - provisioning templates are world accessible

(cherry picked from commit aa0ebe8eef311875695135c1714cb09225e8cd13)

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 #4456 - XSS on 500 error page and bookmark name causing render error (CVE-2014-0089)

(cherry picked from commit 69e46d6d6eb230f3aa4236838999284dfffccb6e)

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

(cherry picked from commit 014c9ab5eb9bb9b8d655d48a8ccd540613390788)

Revert "Fixes #2270 - Detect all OpenStack IPs and test which allows SSH"

This reverts commit eb1bba78e89b21ac1e935c2cfd7dbf7c23e1c646.

In light of #4616 and #4710, further issues with this change were found which
means we need more time to solve it completely and ensure full cross-provider...

Revert "Fixes #4616 - Add a Fog mixin for looking up EC2 IP addresses"

This reverts commit 97c45d66a0066b6abbf486511aa4f93c67e52007.