Schema 18: drop track indexes IF EXISTS, add --noupdate-replication-control to upgrade script
Merge branch 'master' into beta