Merge change 5694 into donut

* changes:
  Implement persistent enable/disable of the backup manager