FS-28 change the order in which the FileSyncManager talks with the server