Mostly copied from 1.1.13
removed post-1.1.13 watcher-related additions
do WatcherSync first, and only if not syncFull. Fixes issue #414
Removed commented out code related to watcher
Merged, fixed conflicts