Merge "Handle keystore keys that are missing certificates."