Strawberry: improvements to Core Data support

This release changes the mergePolicy assigned to the DataContext vended by vendBackgroundContext to NSMergeByPropertyStoreTrumpMergePolicy to favor in-memory objects over those in the store, and fixes the way we deleteDatabase in CoreDataAccess to ensure potentially botched migration files get deleted no matter what.