Catch up on AMO table removals (bug 999119)
Merge pull request #2075 from robhudson/migrations

Catch up on AMO table removals (bug 999119)