Merge change 25628 into eclair

* changes:
  Inefficient but correct fix for 2122381: call finishBackup after every performBackup