Merge change 25775 into eclair

* changes:
  Fix typo in SECONDARY_DATA_RETRY_CONFIG