[rhq] Branch 'spinder/plugin-dev' - 4 commits - modules/helpers