Merge "Recovery now expects public keys in zipfile"