[rhq] Branch 'search' - 2 commits - modules/core