Cherry picked from commit 2e8bce201e with additional updates required for the v4.2.0-rhel branch. Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com> Assisted by AI: Cursor <Auto> Signed-off-by: Chris Evich <cevich@redhat.com>
2e8bce201e
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #554 Approved by: mheon
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #268 Approved by: rhatdan
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>