Editor's drafts for kevin-tweaks branch of scionassociation/scion-cppki_I-D