Rewrite master sync tests to match our new desired functionality.  Start rewriting enginesync logic to match.
Fix last test
No more need to findNewMaster, remove it.
Fix sync deactivation.
Merge branch 'master_sync'