use new datastructure for old pgp key upload api
We cannot respond to conflicts with old clients. New clients should use the new api. But we can store keys uploaded through the old api in the same format the new api uses and signal conflicts if a new client tries to overwrite.
This will also speed up adoption of the new data format.
Maybe even provide a migration?