GONRG-4665: resolved conflicts

3 jobs for !273 with gcp-fix-helm-values in 120 minutes and 1 second (queued for 2 seconds)
latest merge request