Automatic merge from submit-queue (batch tested with PRs 39773, 39739) Fixed cluster validation in e2e tests for HA master.