Merge "Wait for server deletion if validation setup fails"