am 72d19aa5: Tighten up the metadata backup logic

Merge commit '72d19aa51e90d45c7895629db78e548da2f6d469'

* commit '72d19aa51e90d45c7895629db78e548da2f6d469':
  Tighten up the metadata backup logic