added timeout to chunk upload to avoid hanging
Merge branch 'timeout' into build

Conflicts:
	cassandra_snapshotter/agent.py