Multiple module 'comfy.sample' has no attribute & deprecated WARNING after update

I tried running `update_comfyui.bat` and updating through the manager, but keep getting weird errors.

At first I was getting `comfy.sample` errors, and saw this post:
[module 'comfy.sample' has no attribute 'prepare_mask' #3247](https://github.com/comfyanonymous/ComfyUI/issues/3247)

I was able to manually copy the `def prepare_mask` and `def get_additional_models` code from `sampler_helpers.py` to `sample.py`, but now I'm getting this error in the command window when rendering through the ksampler:
```
WARNING: The comfy.samplers.calc_cond_uncond_batch function is deprecated please use the calc_cond_batch one instead.
```

Start by comparing sample.py and sampler_helpers.py, then trace the ksampler path that emits the comfy.samplers.calc_cond_uncond_batch warning. Check whether the reported missing attributes and deprecated call are still reproducible after a clean update; done means the errors and warning have an identified, reproducible resolution.

Written by the indexing model from the issue text.