(cherry picked from commitd5707676e4) (cherry picked from commitb5252fcde5) (cherry picked from commitaaf04460a0) # Conflicts: # lib/dns/pkcs11dh_link.c # lib/dns/pkcs11dsa_link.c # lib/dns/pkcs11gost_link.c # lib/dns/pkcs11rsa_link.c # lib/isc/hmacmd5.c # lib/isc/hmacsha.c # lib/isc/md5.c # lib/isc/sha1.c # lib/isc/sha2.c