Make sure to properly drop and recreate replication triggers in upgrade.sh
Merge branch 'upgrade-script-fixes' into schema-changes-2013-05-15

* upgrade-script-fixes:
  Make sure to properly drop and recreate replication triggers in upgrade.sh