fixes #4120 - fix border-collapse:collapse tables in Firefox with disappearing lines
fixes #4200 - fixed sosreport integration
fixes #4173 - don't update CR attrs when none available, taken from GH-1184
templates - sync from community-templates
fixes #3999 - refactor DRY implementation of "nested label" for objects with ancestry
refs #2816: Prevent diff viewer on report page from overflowing to be outside the parent modal
refs #2314 - more choices in memory drop down
fixes #3725, #4167 - root password validations, remove default password
fixes #4220 dashboard and report-show pages chart-frame is not in place.
fixes #4270 - setting descriptions updated for consistency
fixes #4234 - cannot edit host's puppet parameters
fixes #2726 - smart class parameter override fails validation
fixes #3751 - new/edit submit buttons now have id