GONRG-4168 resolve merge conficts

5 jobs for GONRG-4168-elasticsearch-for-anthos-on-prem in 57 seconds (queued for 1 second)