The schema migration to go with the kitsune cleanup.
Merge pull request #2112 from rlr/migration-for-cleanup

The schema migration to go with the kitsune cleanup.