Merge change 24722 into eclair

* changes:
  Fix connection failure retry behavior; don't try syncing w/o connectivity