Merge changes from topic "Sync-fix-redo" into tm-dev

* changes:
  Only allow the system server to connect to sync adapters
  Revert "Only allow the system server to connect to sync adapters"