Merge change 6130 into donut

* changes:
  Make backup agent run in the system process as well.