upload - client zip file handling, some other cleanup
Merge branch 'iss-700-client-side-zip' into integration