Interim: keep a record of etags and support retrying with timeout
Comment
Timeout and retry bug fixes. Retry backoff
cleanup
cleanup merge difficulties
RELEASE++