Merge pull request #5235 from paul-elliott-arm/fix_test_suite_ssl_2.x

Backport 2.x: Fix test_suite_ssl compilation errors with GCC11