Merge change I66693ea2 into eclair

* changes:
  fix sync exponential backoff for expedited syncs