Downstream hammer-cli-katello 1.16 (Sat 6.17) is leaking rolling CV fields in a few areas due to this commit being cherry picked to 6.17. This PR attempted to address the issue but we were unaware at the time of the scope of the leakage. We can't cleanly revert so we need a new PR for this issue.

See more info in this Slack thread.