need to svn merge the rev2112 from trunk to branch
This bug was previously known as http://jira.rhq-project.org/browse/RHQ-1172