Automatic merge from submit-queue Fixing vSphere Volume plugin bugs This PR fixes #26646 and targeted for 1.3