Merge "[FileBackend] Cleaned up resyncFiles() and added conservative resync option...