Merge change 24921 into eclair

* changes:
  add system properties for experimenting with sync timeouts.