am ba96a561: (-s ours) am 69f8d3c6: (-s ours) am bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct

* commit 'ba96a561e25754eacc0197590c4b449ad625de00':
  DO NOT MERGE : Ensure that the first post-restore backup pass is correct