am fbafa63b: Merge "Print the revision number in the tombstone file." into jb-mr1-dev

* commit 'fbafa63b339808bf8082b705c5121e529e8be29f':
  Print the revision number in the tombstone file.