Merge commit 'c4bd0013e035f19da398ae9d5942df5c1dee4d9c'
Merge branch 'replication'
Refactoring a bunch of code in worker. No functional change.
Merge branch 'master' into replication
Now using pointers for TableDefinition lists.