[rhq] Changes to 'rc/jon3.1.0.GA-test-build'