Merge commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6' * commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6': don't reschedule syncs that failed with a tooManyRetries error
Merge commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6' * commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6': don't reschedule syncs that failed with a tooManyRetries error