Merge "test_live_block_migration cleanup"