[rhq] Branch 'raw-config' - 2 commits - modules/core