fixes #2639 After creating user with empty e-mail it becomes impossible to add it.

fixes #2656 error connecting to vsphere after upgrade to ruby 1.9.3

fixes #2646 Asset icon URLs are incorrect when under a different base URL

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

Fixes #2667 - Don't save during process_hostgroup

fixes #2583 - error message is now properly i18n-ed

fixes #2663 javascript errors on the host form

Fixes #2640 - use relative user logout path

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.

fixes #2334 - location matcher doesn't match on smart parameters