Add challengeId/legacyChallengeId fields

The removedChallenges objects sometimes have challenges on them. For these, we need to have challengeId and legacyCHallengeId fields so we can map to existing challenges and new ones created after release.