When  was cherry-picked, there was a merged conflict which was resolved by changing the commit. In fact, the real cause was that the source of the cherry-pick depended on a secondary commit. This dependency contained the necessary test fixture changes to support the patch, and without it, tests are now failing.
A PR is incoming with a modified version of  to fix the issue.
Since this issue was entered in Red Hat Bugzilla, the release flag has been
set to ? to ensure that it is properly evaluated for this release.
code at https://gitlab.sat.lab.tlv.redhat.com/satellite6/foreman/merge_requests/22
please provide verification steps
This was delivered with Satellite 6.0 which was released on 10 September 2014.