[SyncEvolution] merging "server-config" branch?