fixes #10343 - only log cache deletion failures when saving settings

(cherry picked from commit 83bd400ce6d69c8f946ff5ed31012ab073fcf1b1)

Conflicts:
test/unit/setting_test.rb

Fixes #7515 - Prevent label line breaks in add bookmark modal

(cherry picked from commit 245180fdcfd42b59f1863170e8af0b6f6c907a55)

Fixes #10305 - complete handling for cloudinit-like in vsphere feature

(cherry picked from commit 5d47a167cc2f2ea2bd9cbc88c30045f36949b636)

fixes #10030 - use override method to display templates in folders

(cherry picked from commit 0af12f79a6e6c3a3ecf72d39df89a2edd7e9b39b)

Fixes #10230 - Host clone uses create_hosts permission

Non-admin users are not able to clone hosts. This is a regression, in
the past the create_hosts permission has been used for this, but it no
longer works. Checking the controller route only fixes the regression....

Fixes #9506 - Add granular permissions to config groups

(cherry picked from commit 6825f8de6debe3854e03d171f6de5b630bfc85b9)

fixes #10342 - adding :host_parameters_attributes to except list in template_used()

(cherry picked from commit d4e53f27fefffc4a1b2b0f25f2d35accf5d4de6e)

Fixes #9687 - respect custom controller permissions

(cherry picked from commit a63aa7cbac0f81955ac9ebcf010bfcf45f5b07c1)

fixes #7743 - ensure name is unique in scope of major and minor

(cherry picked from commit 59b230959ab24b3573eb87616805bf3218a2cb13)

refs #5554 - revert string change, save unnecessary retranslation

(cherry picked from commit 4098e93bc45176ffd8f659d28d0db1f8cb1d7734)