Merge change Iaa7edda4 into eclair

* changes:
  don't reschedule syncs that failed with a tooManyRetries error