Make sure the code has all the changes introduced in this PR (for v4.11):
https://code.engineering.redhat.com/gerrit/c/cnv-tests/+/438727

These changes should be reflected in all branches regarding the logic required for each version.
[Yossi] The changes were done in 4.11, but service-mesh feature changed significantly between 4.11 and the later versions (4.12 and on).
This means that the logic in this PR should be applied - with the required changes - in the later versions.