conf: cleanup/separate the original merged windows update code, fix leaving tmp files around

It was quite a mess and never worked right, should've spotted this before.

No idea (and don't really care) how to do proper atomic file updates on
windows (and it wasn't done before this commit anyway), so let the code be
explicit about it.