Potential fix sync issue. Use try-finally for syncRunning flag accessor.
Refactor ManualResync.java again
Update Changelog
Merge remote-tracking branch 'upstream/master'