Small improvement for non-chunked uploads

With NXDRIVE-2298, we made use of the X-Batch-No-Drop HTTP header when finalizing an upload. And then, the batchId had to be removed manually, doing one HTTP call for that.

That is useful for large uploads but the HTTP call can be saved for non-chunked uploads. Let's do this.