Done - r3449.
QA Verified.
This bug was previously known as http://jira.rhq-project.org/browse/RHQ-1806