GONRG-4672: fixed merge conflicts

5 jobs for gcp-tags-for-jobs in 28 seconds (queued for 2 seconds)