NXDRIVE-170: Also handle "Untrashed from the client + remotely modified" case
NXDRIVE-170: Also handle "Untrashed from the client + remotely modified" case

arameshkumar/base-nuxeo-drive,ssdi-drive/nuxeo-drive,arameshkumar/base-nuxeo-drive,rsoumyassdi/nuxeo-drive,ssdi-drive/nuxeo-drive,arameshkumar/nuxeo-drive,arameshkumar/base-nuxeo-drive,rsoumyassdi/nuxeo-drive,arameshkumar/nuxeo-drive,arameshkumar/base-nuxeo-drive,rsoumyassdi/nuxeo-drive,arameshkumar/nuxeo-drive,ssdi-drive/nuxeo-drive,arameshkumar/nuxeo-drive,rsoumyassdi/nuxeo-drive