GitLab

So no need to add them to the icon search paths, which is actually
quite expensive (15% for this method, with David's WIP icon loader
patch applied).

We might even be able to remove more of them, after verifying none
of their installed graphics assests go through the icon loader, but
are rather found via QStandardPaths directly.

QString::toHtmlEscaped() covers this as well anyway.

Conflicts:
	libkdepim/addressline/addresslineedit/addresseelineedit.cpp

(cherry picked from commit a4027425)

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 49bbf036)