Requires #6884
At the end of the grace period for a successful upgrade the agent must have persisted the available rollbacks outside of the update marker file which will be cleaned up by the watcher.
Any valid rollback_available entry present in the upgrade marker will be preserved by the watcher during the cleanup phase.