NXP-11184: Handle local state refresh when a file has been locally renamed
NXP-11184: Locally synchronize a remotely renamed file
Merge branch 'master' into 5.6.0