MDL-22503 blocks upgrade - delete orphan block instances before enforcing NOT NULL...