FolderMan: only touch _currentSyncFolder when done #2407

Also simplity terminateSyncProcess() to always terminate the
*current* sync run. Only one can be running at a time anyway.