[rhq] Branch 'bug/rhq-1' - modules/core