Once https://github.com/eclipse/che/issues/18339 is resolved, need to:

• disable the patches in https://github.com/redhat-developer/codeready-workspaces/blob/crw-2.6-rhel-8/Jenkinsfile#L383-L399
• verify patches are no longer needed
• verify new changes from upstream PR are being propagated into downstream
• close redundant PR after verifying all needed bits are implemented

We will then be able to resolve CRW-1381 too.