[rhq] Branch 'pc' - 2 commits - modules/enterprise