Automatic merge from submit-queue (batch tested with PRs 42162, 41973, 42015, 42115, 41923) Release 3.0.17 etcd image