[rhq] Branch 'nightly/rhq.jon' - 2 commits - modules/enterprise