[rhq] Changes to 'stefan/version'