Merge change 3374 into donut

* changes:
  Fix tracking of backup participants across package remove/update