Fixes #7003 - Revert LDAP to simple_tls

(cherry picked from commit 02432b498a6b01faed2615e4ddbc16f38648ea35)
fixes #7061 - show file upload when template is not locked

(cherry picked from commit 415785addf0423fc8c8588b45b4e31d7a07c5cc0)
Fixes #6608 - expose disk usage info through available_storage_domains API

(cherry picked from commit a52580f5e9e3ef9d7f60bede8b0b1bed4f2005a9)
Fixes #6476 - oVirt VM association with multiple interfaces

(cherry picked from commit 5743465be5ecf59d94b37e728ab46f9d00ade6e2)
Fixes #6756 - exposes vmware resource pools and folders through the API

(cherry picked from commit fe1a27333c7a3dd32f6fd727754516ff7487beb8)
fixes #6860 - add missing attributes to hostgroup jail

(cherry picked from commit 1cb5ba7ef48ec492ac1ef7dec76604c2585ecf86)
Fixes #6929 - Rephrase description string for api import_puppetclasses

(cherry picked from commit 9c1029fa1ca935efaf6c5b92042b508ddfd23edd)
Fixes #6998 - Accept native true for overwrite parameter to host API.

(cherry picked from commit a0d231daf018694a4aec708c2d8e32e69492a84a)
fixes #7082 - combo box style in host multi-select popup windows

Fixing the combo-box style in app/views/hosts/select_multiple_* pages.
Using selectable_f from app/helpers/layout_helper.rb instead.

(cherry picked from commit e761f186357c9a0cae0a4df92fbd211ddaf8b6c5)
fixes #6205 Changed regex to parse CNs from SSL DNs on separator chars

(cherry picked from commit 2821b5e250d2f311e2070c41879720f8745507cf)
Fixes #4350 - Allow any format for role name

(cherry picked from commit 1e1c8575598b6efbdcf4e540fb8ae741e611e8d5)
Fixes #6982 - make tooltips appear above charts

(cherry picked from commit 72c1d0d8cd2a08365ae3a3e8b41621745a82c2b0)
Fixes #6232 - link from chart on overview page to relevent search

(cherry picked from commit 5c5dabb2fda6ac2cf827dc415663d1a631d7dfc2)
fixes #7009, N+1 (actually 6+1) queries in dashboard page

(cherry picked from commit 9f1c910aecc2436da757f33380a38cf6cc3744e7)
fixes #5119 - ensure GCE can list images.

(cherry picked from commit 70b5b765853bbaba86278d5607fdb31b2f66224a)
Fixes #6831 - expire topbar cache for admin on taxonomy updates

(cherry picked from commit 8fabe6618b36ca3d232e8241749405ed8217c656)
fixes #5240 - expose eager-zeroing for vSphere

(cherry picked from commit 4c879875a1ff5b8cd2e506982acc88cbb3d2a0f3)
Fixes #7174 - add delay on autocomplete

(cherry picked from commit 233eea0b63d565fd399af36013efeac2947208d1)
templates - sync from community-templates

(cherry picked from commit 7271af01559aa141c926780f7480cbeeed1540a7)
i18n - extracting new, updating rails, pulling from tx