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

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

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

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 #2636 host submit missing progress-bar when installed at sub-domain
(cherry picked from commit 92326dd2588338079a10f11c676380d75b3a4d1f)

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

fixes #2630 - restrict assignment of roles to those a user has (CVE-2013-2113)
(cherry picked from commit bae665de387d63f93740670ec2542db90084d0eb)

Fixes #2038 - updated config and partition table templates using ones from the community repository
(cherry picked from commit cb92c0be69a00142158d884e05097b47d20480da)

fixes #2616 - Hostgroup fields not populating when parent fields are selected
(cherry picked from commit 1bd19611c2420923350b72f150774134b5b179db)