When a conflict-rename or a temporary-rename fails, notify the LockWatcher. It'll regularly check whether the file has become accesible again. When it has, another sync is triggered. owncloud/enterprise#1288