+++ This bug was initially created as a clone of Bug #2097696 +++ Description of problem: ======================= Backport the fix for: https://issues.redhat.com/browse/MGMT-9779 to ocm-release-2.5