fixes #14000 - respect custom controller permissions

Allows controller_permission method to override the permission suffix
used in resource_scope, originally from a63aa7c and removed in bb39df2.

(cherry picked from commit f05b9307fe36d877364b0ee5bee7212c3315c97e)

fixes #13828 - CVE-2016-2100 - only showing relevant bookmarks

(cherry picked from commit a61344da14f73920b4bdc7ad8220e7a0ed998031)

templates - sync from community-templates

i18n - extracting new, pulling from tx

Fixes #13834 - associate puppet proxies only for puppet imports

(cherry picked from commit 6f16c9159dad61641908d88eeb62ab45d22bd396)

fixes #12187 - checking if OpenStack is defined before calling that constant

(cherry picked from commit 49c332e55d61d08eb51ebec8029889a7e396e125)

fixes #13852 - add user_data to images api docs

(cherry picked from commit 1cd4a22df2b4a34ea8a03150b1bd406494587ed3)

Fixes #13232 - Reword 'ACK' buttons texts

(cherry picked from commit 6fdd5bf52e923c33bc82ecc0d0c8be3d71eb71e0)

Fixes #13519 - Alias lookupkey key to parameter

(cherry picked from commit 9734f1f395b38a5b4920086bb287ea5857704df3)

refs #12718 - change capitalisation, extract more strings

Capitalisation now matches the other rows on the same page.

(cherry picked from commit 4fd9aebea3efde8cd0ec272d173f3b4ecc25e51e)