[Pki-devel] More Fedora 24 fixes