Merge change I996db8da into eclair

* changes:
  Fix tls crash on startup if more than one RS contexts are created in one process.