fix error when sending thumbnail to master

Fix for #26867

Hunted down and debugged with great help from Geoff Murphy

- remove/comment unused variables
- remove unused imports
- fixed some bugs using incorrect variables

better stream handling when uploading files
Might solve the problem with OS X masters