Merge "fskeyring & userspace reboot: support CE keys"