repair damaged svc_x records during upgrade, #22524