Merge pull request #4545 from richardcase/kpromo_fixes_post_release · kubernetes-sigs/cluster-api-provider-aws@9eb88c7