For ENG-5515, make canceling old repair algo atomic with creating new one to receive subsequent cancellations