Fix CMS key generation defaults

With the change to encryption subkeys by default for OpenPGP this
accidentally also set a subkey for CMS certificates which will
lead to an error.
This problem was masked by gnupg/issue2043 which led to the same
error.

(cherry picked from commit 49bbf036cde72039bdb796109d28cf37cf609810)