Rescue duplicate column errors in migration
Works around the case where the production db is old and db syncs puts the db into an
unusual state where the content_archive table is a couple of migrations ahead of the
rest of the db
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
PagePieces should test as an instance of their target
Don't revoke object urls immediately

wait until the field is unloaded. Otherwise we see broken images.