Make Uploading more stable and resilient to network outages and resumable
Merge remote-tracking branch 'upstream/retryon500' into retryon500

Conflicts:
	git-annex-remote-googledrive