Merge "Allow BackupHelper to be overridden" into sc-qpr1-dev