Done - r3266.
This bug was previously known as http://jira.rhq-project.org/browse/RHQ-1642 This bug is related to RHQ-1537