base

Merge change I852f8e46 into eclair

* changes:
  Only re-initialize backup state if @pm@ metadata is missing, to defensively work around a still-mysterious bug where the list of saved packages ends up being empty even though we still have state pending.  If we do re-initialize, then wipe all state to make sure the right thing happens.