See bug 1181771 - https://bugzilla.redhat.com/show_bug.cgi?id=1181771.

All that is remaining for this bug is to merge it into the 6.0 production branch. (An opportunity for Ben to learn how to "cherry pick".)

This content will need to be updated for 6.2 with content from upstream project version 2.0.0, so there is no need to add it to the master branch. However, we will have to make sure there is a task (or epic) to incorporate updated content from the upstream project.