Automatic merge from submit-queue

Better logging and support for running non-default version from etcd image

Ref #20504