Stefan McShane 0482705df0 Merge branch 'master' into capi %!s(int64=3) %!d(string=hai) anos
..
init_ce.go ea45c1dcdc updated batchv1beta1 to batchv1, also ran go fmt for whole package (#2718) %!s(int64=3) %!d(string=hai) anos
init_ee.go c3cd4586ba relocate cookie query and consolidate types %!s(int64=3) %!d(string=hai) anos
loader.go a3a0695d1d changes to support cluster control plane capi cluster %!s(int64=3) %!d(string=hai) anos