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

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