fixes #5471 html escape auto-completer values (CVE-2014-0208)

(cherry picked from commit ee672544f1ad5990ca0e39acd86f83cbbe06ebe9)

fixes #5612 - use correct permissions for authz in parameters API

(cherry picked from commit 7cb05aa94e942bd3917c6cde33957288ea84a735)

fixes #4590 - convert VMware SCSI controller type during creation

(cherry picked from commit 7e27bdf3a593f0e2ac0661f4a3c9a9bb3ab6227c)

fixes #5506 - added scoped search to SmartProxy for UI and API v2

(cherry picked from commit 428b1cfb6f6e19294756078ee70d862a36a566de)

Fixes #4370 - Filters list show permissions

(cherry picked from commit 46da92f0cac25391c1c76599ef19edf38684b9d5)

Fixes #4287 - Join directly to template_combinations when resolving templates

(cherry picked from commit 1443ec139bdb0a31faeef80f6c177d4f30fa4bdb)

fixes #5038 - remove empty label causing template edit box indentation

(cherry picked from commit a33142b9cad0f15152c6ec683d7e7372350e9acc)

fixes #5490 - ambiguous column in taxonomix pluck on Rails 3.2.8

(cherry picked from commit 3089c85f005425e8fec07c560ce5fb65ca25d45d)

fixes #5132 URL doesn't update correctly after creating a new host

(cherry picked from commit 5f58478b95ffd51eb41f53718e09c03a3613c827)

i18n - extracting new, updating rails, pulling from tx