Merge change I86397f6c into eclair-mr2

* changes:
  moved the hidden sync helpers out of the framework