svn merge -r2527:2528 https://tungsten-replicator.googlecode.com/svn/branches/2.2.1-maintenance/builder .
Specify a value for the shard_id column when upgrading from TE 1.5 to CT 2.0 TUC-2282


git-svn-id: http://tungsten-replicator.googlecode.com/svn/trunk@2530 9f5e3340-5c9a-25cb-7c1c-c133a2e9e928