[rhq] Branch 'bug/759615' - 14 commits - modules/core modules/enterprise modules/plugins