[2.73.0] Cherrypick #38041#38258

Amar3tto merged 1 commit intoapache:release-2.73apache/beam:release-2.73from

jrmccluskey:masterContainerjrmccluskey/beam:masterContainerCopy head branch name to clipboard