Merge pull request #3926 from rodrigo-dc/mbedtls-2.7

Backport 2.7: Fix build failure on gcc-11