[rhq] Branch 'jay-avail' - modules/core