Add TODO about removing unused columns in LastKnownState
Format
NXP-11185: Locally synchronize a remotely moved file
Fix comment in test
Merge branch 'master' into 5.6.0