am a2dbe4e3: Merge "Rejigger the invalid-key checks at backup time"

* commit 'a2dbe4e3cd3d9d52cda3e798bf9405ff8a780250':
  Rejigger the invalid-key checks at backup time