Merge branch 'hotfix'

# Conflicts:
#	libs/openssl/crypto/x509/t_req.c
#	libs/openssl/crypto/x509/t_x509.c
#	libs/openssl/crypto/x509/x509_lu.c
#	libs/openssl/include/openssl/opensslv.h
#	libs/openssl/providers/implementations/kdfs/krb5kdf.c

Source commit: fdb00c7be54f8e27532646d8315e449230fb63d4