fixes #3999 - refactor DRY implementation of "nested label" for objects with ancestry

templates - sync from community-templates

fixes #4173 - don't update CR attrs when none available, taken from GH-1184

fixes #4120 - fix border-collapse:collapse tables in Firefox with disappearing lines

Fixes #4196 "Power ON this machine" disappeared for new VMWare hosts

fixes #3553 - add "except" option to prevent puppet class import to select types of import

fixes #4189 - Facts charts are not rendered

fixes #4188 - api/v2/status incorrectly shows api_version: 1

fixes #2866 - Changing a hostgroup name doesn't update associated Smart Variable matchers

fixes #3960 - wrap APIv2 errors in an "error" node