Merge change 6285

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