Fix sync when a folder is renamed locally and remotely

Scenario:

1. Server side: user1 create a “Folder1” with 2 pictures inside
2. Client side: user1 synchronizes “Folder1”
3. Quit Drive
4. Server side: rename “Folder1” by “Folder1-ServerName”
5. Client side: rename “Folder1” by “Folder1LocalRename”
6. Client side: restart Drive

Current Results:
Server side: “Folder1LocalRename” is uploaded (and no more “Folder1-ServerName”)
Client side: “Folder1-ServerName” is downloaded (and no more “Folder1LocalRename”)

Expected Results:
This looks like a conflict situation on the folder. Conflict should be handled client side in the conflict management UI, letting the user the choice to either apply server name or keep client name and update server. Just by renaming, not deleting the folder and re-downloading.