In case we need to rollback from 2.11 to 2.8, this is a stab at
fixing things. It doesn't seem like there are as many relevant
data transformations from 2.10 to 2.11.
Not including table drops, because having extra tables is not
destructive.
Change-Id: I96a638eeeb832fcc697cde7d94d981b5cbca6234