Merge change 5459 into donut

* changes:
  Make the BackupHelperDispatcher properly handle multiple helpers.