Fix(deploy-candidate): Save duplicate deploy candidate on redeploy

Saves the duplicate deploy candidate on redeploy, instead of the old one. Backport of #7933.