[rhq] Branch 'bug/759615' - etc/m2 modules/core modules/enterprise