Merge change 6317 into donut

* changes:
  Make enable/provisioning of the backup service a two-step process