[rhq] Branch 'mtho11/consolidated-metrics' - modules/enterprise