Done and smoke tested - r5218.
This bug was previously known as http://jira.rhq-project.org/browse/RHQ-2441