[rhq] Changes to 'feature/rest'