[rhq] Changes to 'release-3.0.1-apache-fixes'