Merge "Allow migration to SP to be rolled back by filesystem checkpoint"