[rhq] Branch 'release_jon3.x' - etc/samples modules/core modules/plugins