Then it's needed to update below testing branches:

• cnv-4.19
• cnv-4.18
• cnv-4.17
• cnv-4.16

And make the existing workaround persistant and not depedant on the bug, because they are not going to be fixed, according to jpeimer@redhat.com and ngavrilo@redhat.com 

Update: We will get backports eventually, so once those are merged we should verify & remove id's from automation.