now cancelling upload safely
Merge branch 'retry_upload' into build

Conflicts:
	cassandra_snapshotter/agent.py