Automatic merge from submit-queue Minor fixes to migrate-if-needed script Ref #22448 #20504 @lavalamp