[rhq] Branch 'bug/1016175' - 2 commits - modules/enterprise